diff options
author | Zhenhua Luo <b19537@freescale.com> | 2011-12-28 05:56:17 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-01-05 10:17:02 +0100 |
commit | 9cc211194f0b43bc651b1b06c4128000fd867e02 (patch) | |
tree | b366008afd0fb14434b71ace61be6922d7844ae3 /meta-oe/recipes-support/xfsprogs | |
parent | 42d6f4f36696faaf0e526b14bcc6daff51ab943b (diff) | |
download | meta-openembedded-9cc211194f0b43bc651b1b06c4128000fd867e02.tar.gz |
xfsprogs: add version 3.1.7
xfsprogs provides XFS filesystem utilities.
Signed-off-by: Zhenhua Luo <b19537@freescale.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support/xfsprogs')
-rw-r--r-- | meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.7/remove-install-as-user.patch | 368 | ||||
-rw-r--r-- | meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.7.bb | 46 |
2 files changed, 414 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.7/remove-install-as-user.patch b/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.7/remove-install-as-user.patch new file mode 100644 index 000000000..1263aafa2 --- /dev/null +++ b/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.7/remove-install-as-user.patch | |||
@@ -0,0 +1,368 @@ | |||
1 | diff -urN a/include/buildmacros b/include/buildmacros | ||
2 | --- a/include/buildmacros 2011-12-27 23:32:31.554197934 -0600 | ||
3 | +++ b/include/buildmacros 2011-12-27 23:33:17.895485348 -0600 | ||
4 | @@ -30,7 +30,7 @@ | ||
5 | $(LFILES:.l=.o) \ | ||
6 | $(YFILES:%.y=%.tab.o) | ||
7 | |||
8 | -INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) | ||
9 | +INSTALL = $(TOPDIR)/install-sh | ||
10 | |||
11 | IMAGES_DIR = $(TOPDIR)/all-images | ||
12 | DIST_DIR = $(TOPDIR)/dist | ||
13 | diff -urN a/include/install-sh b/include/install-sh | ||
14 | --- a/include/install-sh 2011-12-27 23:32:31.556198121 -0600 | ||
15 | +++ b/include/install-sh 2011-12-27 23:32:57.012201738 -0600 | ||
16 | @@ -24,11 +24,11 @@ | ||
17 | # set set | yes yes | ||
18 | # | ||
19 | _usage() { | ||
20 | - echo "Usage: $prog [-o owner] [-g group] [-m mode] -d directory" | ||
21 | - echo "or $prog [-D] [-o owner] [-g group] [-m mode] file directory/file" | ||
22 | - echo "or $prog [-o owner] [-g group] [-m mode] file [file ...] directory" | ||
23 | + echo "Usage: $prog [-m mode] -d directory" | ||
24 | + echo "or $prog [-m mode] file directory/file" | ||
25 | + echo "or $prog [-m mode] file [file ...] directory" | ||
26 | echo "or $prog -S file target (creates \"target\" symlink)" | ||
27 | - echo "or $prog -T lt_arg [-o owner] [-g group] [-m mode] libtool.lai directory" | ||
28 | + echo "or $prog -T lt_arg [-m mode] libtool.lai directory" | ||
29 | echo "" | ||
30 | echo "The \$DIST_MANIFEST and \$DIST_ROOT environment variables affect the" | ||
31 | echo "behaviour of this command - see comments in the script." | ||
32 | @@ -38,32 +38,6 @@ | ||
33 | exit 1 | ||
34 | } | ||
35 | |||
36 | -_chown () | ||
37 | -{ | ||
38 | - _st=255 | ||
39 | - if [ $# -eq 3 ] ; then | ||
40 | - chown $1:$2 $3 | ||
41 | - _st=$? | ||
42 | - if [ $_st -ne 0 ] ; then | ||
43 | - if [ $REAL_UID != '0' ] ; then | ||
44 | - if [ ! -f $DIST_ROOT/.chown.quiet ] ; then | ||
45 | - echo '===============================================' | ||
46 | - echo Ownership of files under ${DIST_ROOT:-/} | ||
47 | - echo cannot be changed | ||
48 | - echo '===============================================' | ||
49 | - if [ -n "$DIST_ROOT" ] ; then | ||
50 | - touch $DIST_ROOT/.chown.quiet | ||
51 | - fi | ||
52 | - fi | ||
53 | - _st=0 | ||
54 | - fi | ||
55 | - fi | ||
56 | - fi | ||
57 | - | ||
58 | - return $_st | ||
59 | -} | ||
60 | - | ||
61 | - | ||
62 | _manifest () | ||
63 | { | ||
64 | echo $* | sed -e 's/\/\//\//g' >>${DIST_MANIFEST:-/dev/null} | ||
65 | @@ -77,9 +51,6 @@ | ||
66 | Tflag=false | ||
67 | DIRMODE=755 | ||
68 | FILEMODE=644 | ||
69 | -OWNER=`id -u` | ||
70 | -GROUP=`id -g` | ||
71 | -REAL_UID=$OWNER | ||
72 | |||
73 | # default is to install and don't append manifest | ||
74 | INSTALL=true | ||
75 | @@ -92,24 +63,16 @@ | ||
76 | |||
77 | if $INSTALL | ||
78 | then | ||
79 | - CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown | ||
80 | + CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; | ||
81 | else | ||
82 | - CP=true; LN=true; MKDIR=true; CHMOD=true; CHOWN=true | ||
83 | + CP=true; LN=true; MKDIR=true; CHMOD=true; | ||
84 | fi | ||
85 | |||
86 | -[ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true | ||
87 | - | ||
88 | -while getopts "Dcm:d:S:o:g:T:" c $* | ||
89 | +while getopts "Dcm:d:S:T:" c $* | ||
90 | do | ||
91 | case $c in | ||
92 | c) | ||
93 | ;; | ||
94 | - g) | ||
95 | - GROUP=$OPTARG | ||
96 | - ;; | ||
97 | - o) | ||
98 | - OWNER=$OPTARG | ||
99 | - ;; | ||
100 | m) | ||
101 | DIRMODE=`expr $OPTARG` | ||
102 | FILEMODE=$DIRMODE | ||
103 | @@ -144,18 +107,7 @@ | ||
104 | # first usage | ||
105 | # | ||
106 | $MKDIR -p $dir | ||
107 | - status=$? | ||
108 | - if [ $status -eq 0 ] | ||
109 | - then | ||
110 | - $CHMOD $DIRMODE $dir | ||
111 | - status=$? | ||
112 | - fi | ||
113 | - if [ $status -eq 0 ] | ||
114 | - then | ||
115 | - $CHOWN $OWNER $GROUP $dir | ||
116 | - status=$? | ||
117 | - fi | ||
118 | - $MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT} | ||
119 | + $MANIFEST d $DIRMODE ${dir#$DIST_ROOT} | ||
120 | elif $Sflag | ||
121 | then | ||
122 | # | ||
123 | @@ -201,7 +153,7 @@ | ||
124 | install_name=$target/$solib | ||
125 | $CP $solib $install_name | ||
126 | status=$? | ||
127 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT} | ||
128 | + $MANIFEST f $FILEMODE $HERE/$solib ${install_name#$DIST_ROOT} | ||
129 | break | ||
130 | fi | ||
131 | done | ||
132 | @@ -252,7 +204,7 @@ | ||
133 | install_name=$target/$old_library | ||
134 | $CP $old_library $install_name | ||
135 | status=$? | ||
136 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT} | ||
137 | + $MANIFEST f $FILEMODE $HERE/$old_library ${install_name#$DIST_ROOT} | ||
138 | ;; | ||
139 | *) | ||
140 | echo "$prog: -T $lt_install invalid" | ||
141 | @@ -265,7 +217,6 @@ | ||
142 | if [ $status -eq 0 ] | ||
143 | then | ||
144 | $CHMOD $FILEMODE $install_name | ||
145 | - $CHOWN $OWNER $GROUP $install_name | ||
146 | fi | ||
147 | ;; | ||
148 | esac | ||
149 | @@ -290,23 +241,10 @@ | ||
150 | then | ||
151 | if [ -f $dir/$f ] | ||
152 | then | ||
153 | - $CHMOD $FILEMODE $dir/$f | ||
154 | - status=$? | ||
155 | - if [ $status -eq 0 ] | ||
156 | - then | ||
157 | - $CHOWN $OWNER $GROUP $dir/$f | ||
158 | - status=$? | ||
159 | - fi | ||
160 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f | ||
161 | + $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f | ||
162 | else | ||
163 | $CHMOD $FILEMODE $dir | ||
164 | - status=$? | ||
165 | - if [ $status -eq 0 ] | ||
166 | - then | ||
167 | - $CHOWN $OWNER $GROUP $dir | ||
168 | - status=$? | ||
169 | - fi | ||
170 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$dir ${dir#$DIST_ROOT} | ||
171 | + $MANIFEST f $FILEMODE $HERE/$dir ${dir#$DIST_ROOT} | ||
172 | fi | ||
173 | fi | ||
174 | else | ||
175 | @@ -332,14 +270,7 @@ | ||
176 | status=$? | ||
177 | if [ $status -eq 0 ] | ||
178 | then | ||
179 | - $CHMOD $FILEMODE $dir/$f | ||
180 | - status=$? | ||
181 | - if [ $status -eq 0 ] | ||
182 | - then | ||
183 | - $CHOWN $OWNER $GROUP $dir/$f | ||
184 | - status=$? | ||
185 | - fi | ||
186 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f | ||
187 | + $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f | ||
188 | fi | ||
189 | [ $status -ne 0 ] && break | ||
190 | done | ||
191 | diff -urN a/install-sh b/install-sh | ||
192 | --- a/install-sh 2011-12-27 23:32:31.565200349 -0600 | ||
193 | +++ b/install-sh 2011-12-27 23:32:51.854178224 -0600 | ||
194 | @@ -24,11 +24,11 @@ | ||
195 | # set set | yes yes | ||
196 | # | ||
197 | _usage() { | ||
198 | - echo "Usage: $prog [-o owner] [-g group] [-m mode] -d directory" | ||
199 | - echo "or $prog [-D] [-o owner] [-g group] [-m mode] file directory/file" | ||
200 | - echo "or $prog [-o owner] [-g group] [-m mode] file [file ...] directory" | ||
201 | + echo "Usage: $prog [-m mode] -d directory" | ||
202 | + echo "or $prog [-m mode] file directory/file" | ||
203 | + echo "or $prog [-m mode] file [file ...] directory" | ||
204 | echo "or $prog -S file target (creates \"target\" symlink)" | ||
205 | - echo "or $prog -T lt_arg [-o owner] [-g group] [-m mode] libtool.lai directory" | ||
206 | + echo "or $prog -T lt_arg [-m mode] libtool.lai directory" | ||
207 | echo "" | ||
208 | echo "The \$DIST_MANIFEST and \$DIST_ROOT environment variables affect the" | ||
209 | echo "behaviour of this command - see comments in the script." | ||
210 | @@ -38,32 +38,6 @@ | ||
211 | exit 1 | ||
212 | } | ||
213 | |||
214 | -_chown () | ||
215 | -{ | ||
216 | - _st=255 | ||
217 | - if [ $# -eq 3 ] ; then | ||
218 | - chown $1:$2 $3 | ||
219 | - _st=$? | ||
220 | - if [ $_st -ne 0 ] ; then | ||
221 | - if [ $REAL_UID != '0' ] ; then | ||
222 | - if [ ! -f $DIST_ROOT/.chown.quiet ] ; then | ||
223 | - echo '===============================================' | ||
224 | - echo Ownership of files under ${DIST_ROOT:-/} | ||
225 | - echo cannot be changed | ||
226 | - echo '===============================================' | ||
227 | - if [ -n "$DIST_ROOT" ] ; then | ||
228 | - touch $DIST_ROOT/.chown.quiet | ||
229 | - fi | ||
230 | - fi | ||
231 | - _st=0 | ||
232 | - fi | ||
233 | - fi | ||
234 | - fi | ||
235 | - | ||
236 | - return $_st | ||
237 | -} | ||
238 | - | ||
239 | - | ||
240 | _manifest () | ||
241 | { | ||
242 | echo $* | sed -e 's/\/\//\//g' >>${DIST_MANIFEST:-/dev/null} | ||
243 | @@ -77,9 +51,6 @@ | ||
244 | Tflag=false | ||
245 | DIRMODE=755 | ||
246 | FILEMODE=644 | ||
247 | -OWNER=`id -u` | ||
248 | -GROUP=`id -g` | ||
249 | -REAL_UID=$OWNER | ||
250 | |||
251 | # default is to install and don't append manifest | ||
252 | INSTALL=true | ||
253 | @@ -92,24 +63,16 @@ | ||
254 | |||
255 | if $INSTALL | ||
256 | then | ||
257 | - CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown | ||
258 | + CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; | ||
259 | else | ||
260 | - CP=true; LN=true; MKDIR=true; CHMOD=true; CHOWN=true | ||
261 | + CP=true; LN=true; MKDIR=true; CHMOD=true; | ||
262 | fi | ||
263 | |||
264 | -[ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true | ||
265 | - | ||
266 | -while getopts "Dcm:d:S:o:g:T:" c $* | ||
267 | +while getopts "Dcm:d:S:T:" c $* | ||
268 | do | ||
269 | case $c in | ||
270 | c) | ||
271 | ;; | ||
272 | - g) | ||
273 | - GROUP=$OPTARG | ||
274 | - ;; | ||
275 | - o) | ||
276 | - OWNER=$OPTARG | ||
277 | - ;; | ||
278 | m) | ||
279 | DIRMODE=`expr $OPTARG` | ||
280 | FILEMODE=$DIRMODE | ||
281 | @@ -144,18 +107,7 @@ | ||
282 | # first usage | ||
283 | # | ||
284 | $MKDIR -p $dir | ||
285 | - status=$? | ||
286 | - if [ $status -eq 0 ] | ||
287 | - then | ||
288 | - $CHMOD $DIRMODE $dir | ||
289 | - status=$? | ||
290 | - fi | ||
291 | - if [ $status -eq 0 ] | ||
292 | - then | ||
293 | - $CHOWN $OWNER $GROUP $dir | ||
294 | - status=$? | ||
295 | - fi | ||
296 | - $MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT} | ||
297 | + $MANIFEST d $DIRMODE ${dir#$DIST_ROOT} | ||
298 | elif $Sflag | ||
299 | then | ||
300 | # | ||
301 | @@ -201,7 +153,7 @@ | ||
302 | install_name=$target/$solib | ||
303 | $CP $solib $install_name | ||
304 | status=$? | ||
305 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT} | ||
306 | + $MANIFEST f $FILEMODE $HERE/$solib ${install_name#$DIST_ROOT} | ||
307 | break | ||
308 | fi | ||
309 | done | ||
310 | @@ -252,7 +204,7 @@ | ||
311 | install_name=$target/$old_library | ||
312 | $CP $old_library $install_name | ||
313 | status=$? | ||
314 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT} | ||
315 | + $MANIFEST f $FILEMODE $HERE/$old_library ${install_name#$DIST_ROOT} | ||
316 | ;; | ||
317 | *) | ||
318 | echo "$prog: -T $lt_install invalid" | ||
319 | @@ -265,7 +217,6 @@ | ||
320 | if [ $status -eq 0 ] | ||
321 | then | ||
322 | $CHMOD $FILEMODE $install_name | ||
323 | - $CHOWN $OWNER $GROUP $install_name | ||
324 | fi | ||
325 | ;; | ||
326 | esac | ||
327 | @@ -290,23 +241,10 @@ | ||
328 | then | ||
329 | if [ -f $dir/$f ] | ||
330 | then | ||
331 | - $CHMOD $FILEMODE $dir/$f | ||
332 | - status=$? | ||
333 | - if [ $status -eq 0 ] | ||
334 | - then | ||
335 | - $CHOWN $OWNER $GROUP $dir/$f | ||
336 | - status=$? | ||
337 | - fi | ||
338 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f | ||
339 | + $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f | ||
340 | else | ||
341 | $CHMOD $FILEMODE $dir | ||
342 | - status=$? | ||
343 | - if [ $status -eq 0 ] | ||
344 | - then | ||
345 | - $CHOWN $OWNER $GROUP $dir | ||
346 | - status=$? | ||
347 | - fi | ||
348 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$dir ${dir#$DIST_ROOT} | ||
349 | + $MANIFEST f $FILEMODE $HERE/$dir ${dir#$DIST_ROOT} | ||
350 | fi | ||
351 | fi | ||
352 | else | ||
353 | @@ -332,14 +270,7 @@ | ||
354 | status=$? | ||
355 | if [ $status -eq 0 ] | ||
356 | then | ||
357 | - $CHMOD $FILEMODE $dir/$f | ||
358 | - status=$? | ||
359 | - if [ $status -eq 0 ] | ||
360 | - then | ||
361 | - $CHOWN $OWNER $GROUP $dir/$f | ||
362 | - status=$? | ||
363 | - fi | ||
364 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f | ||
365 | + $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f | ||
366 | fi | ||
367 | [ $status -ne 0 ] && break | ||
368 | done | ||
diff --git a/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.7.bb b/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.7.bb new file mode 100644 index 000000000..383088729 --- /dev/null +++ b/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.7.bb | |||
@@ -0,0 +1,46 @@ | |||
1 | DESCRIPTION = "XFS Filesystem Utilities" | ||
2 | HOMEPAGE = "http://oss.sgi.com/projects/xfs" | ||
3 | SECTION = "base" | ||
4 | LICENSE = "LGPL2.1" | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://Makefile;endline=3;md5=def2844770bb44eba37bc9ca8610fad4" | ||
7 | |||
8 | DEPENDS = "util-linux" | ||
9 | |||
10 | SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz \ | ||
11 | file://remove-install-as-user.patch \ | ||
12 | " | ||
13 | SRC_URI[md5sum] = "049cf9873794ea49d0bb3f12d45748a4" | ||
14 | SRC_URI[sha256sum] = "e150914210ac5fd29c098ef0fd94bdec51d2fb231cf9faa765c16ec6d75c8eaa" | ||
15 | |||
16 | inherit autotools | ||
17 | |||
18 | FILES_${PN}-dev += "${base_libdir}/libhandle.la \ | ||
19 | ${base_libdir}/libhandle.so" | ||
20 | |||
21 | EXTRA_OECONF = "--enable-gettext=no" | ||
22 | do_configure () { | ||
23 | export DEBUG="-DNDEBUG" | ||
24 | oe_runconf | ||
25 | } | ||
26 | |||
27 | LIBTOOL = "${HOST_SYS}-libtool" | ||
28 | EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" | ||
29 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
30 | PARALLEL_MAKE = "" | ||
31 | |||
32 | do_install () { | ||
33 | export DIST_ROOT=${D} | ||
34 | oe_runmake install | ||
35 | # needed for xfsdump | ||
36 | oe_runmake install-dev | ||
37 | # replace extra links to /usr/lib with relative links (otherwise autotools_prepackage_lamangler fails to read nonexistent link) | ||
38 | rm -f ${D}/${base_libdir}/libhandle.la | ||
39 | rm -f ${D}/${base_libdir}/libhandle.a | ||
40 | ln -s ../usr/lib/libhandle.la ${D}/${base_libdir}/libhandle.la | ||
41 | ln -s ../usr/lib/libhandle.a ${D}/${base_libdir}/libhandle.a | ||
42 | |||
43 | # and link from /usr/lib/libhandle.so to /lib/libhandle.so | ||
44 | rm -f ${D}/${libdir}/libhandle.so | ||
45 | ln -s ../../lib/libhandle.a ${D}/${libdir}/libhandle.so | ||
46 | } | ||