summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-08-14 06:31:01 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-08-16 12:58:31 +0200
commiteefdbbec6c9c176ac6060ec33303b45660fd4e32 (patch)
tree445a149466547c56a7aee245d6be77033c550591 /meta-oe
parent6a13d57d0da17ee36749b9d98f745e10dfe26c27 (diff)
downloadmeta-openembedded-eefdbbec6c9c176ac6060ec33303b45660fd4e32.tar.gz
xfsprogs: move to meta-filesystems and upgrade
- Move xfsprogs from meta-oe to meta-filesystems - Upgrade xfsprogs to 3.1.11 [YOCTO #4178] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/drop-configure-check-for-aio.patch99
-rw-r--r--meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/remove-install-as-user.patch368
-rw-r--r--meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb57
3 files changed, 0 insertions, 524 deletions
diff --git a/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/drop-configure-check-for-aio.patch b/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/drop-configure-check-for-aio.patch
deleted file mode 100644
index a1c60424a..000000000
--- a/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/drop-configure-check-for-aio.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1Upstream-Status: Pending
2
3From a38bf800a655ea32cbddd6504e15c2f18597fd13 Mon Sep 17 00:00:00 2001
4From: Andreas Oberritter <obi@opendreambox.org>
5Date: Wed, 13 Mar 2013 14:40:13 +0100
6Subject: [PATCH] xfsprogs: drop configure check for aio
7
8It's unused and breaks compilation with uclibc.
9
10Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
11---
12 configure.in | 6 +++---
13 m4/Makefile | 1 -
14 m4/package_aiodev.m4 | 37 -------------------------------------
15 3 files changed, 3 insertions(+), 41 deletions(-)
16 delete mode 100644 m4/package_aiodev.m4
17
18diff --git a/configure.in b/configure.in
19index 664c0e9..f7d35f1 100644
20--- a/configure.in
21+++ b/configure.in
22@@ -46,6 +46,9 @@ AC_ARG_ENABLE(lib64,
23 enable_lib64=yes)
24 AC_SUBST(enable_lib64)
25
26+librt="-lrt"
27+AC_SUBST(librt)
28+
29 #
30 # If the user specified a libdir ending in lib64 do not append another
31 # 64 to the library names.
32@@ -91,9 +94,6 @@ AC_PACKAGE_GLOBALS(xfsprogs)
33 AC_PACKAGE_UTILITIES(xfsprogs)
34 AC_MULTILIB($enable_lib64)
35
36-AC_PACKAGE_NEED_AIO_H
37-AC_PACKAGE_NEED_LIO_LISTIO
38-
39 AC_PACKAGE_NEED_UUID_H
40 AC_PACKAGE_NEED_UUIDCOMPARE
41
42diff --git a/m4/Makefile b/m4/Makefile
43index 654a4fb..d282f0a 100644
44--- a/m4/Makefile
45+++ b/m4/Makefile
46@@ -14,7 +14,6 @@ CONFIGURE = \
47
48 LSRCFILES = \
49 manual_format.m4 \
50- package_aiodev.m4 \
51 package_blkid.m4 \
52 package_globals.m4 \
53 package_libcdev.m4 \
54diff --git a/m4/package_aiodev.m4 b/m4/package_aiodev.m4
55deleted file mode 100644
56index 490d9c8..0000000
57--- a/m4/package_aiodev.m4
58+++ /dev/null
59@@ -1,37 +0,0 @@
60-#
61-# Check if we have a libaio.h installed
62-#
63-AC_DEFUN([AC_PACKAGE_WANT_AIO],
64- [ AC_CHECK_HEADERS(libaio.h, [ have_aio=true ], [ have_aio=false ])
65- AC_SUBST(have_aio)
66- ])
67-
68-#
69-# Check if we have an aio.h installed
70-#
71-AC_DEFUN([AC_PACKAGE_NEED_AIO_H],
72- [ AC_CHECK_HEADERS(aio.h)
73- if test $ac_cv_header_aio_h = no; then
74- echo
75- echo 'FATAL ERROR: could not find a valid <aio.h> header.'
76- exit 1
77- fi
78- ])
79-
80-#
81-# Check if we have the lio_listio routine in either libc/librt
82-#
83-AC_DEFUN([AC_PACKAGE_NEED_LIO_LISTIO],
84- [ AC_CHECK_FUNCS(lio_listio)
85- if test $ac_cv_func_lio_listio = yes; then
86- librt=""
87- else
88- AC_CHECK_LIB(rt, lio_listio,, [
89- echo
90- echo 'FATAL ERROR: could not find a library with lio_listio.'
91- exit 1],[-lpthread])
92- librt="-lrt"
93- fi
94- AC_SUBST(librt)
95- ])
96-
97--
981.7.10.4
99
diff --git a/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/remove-install-as-user.patch b/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/remove-install-as-user.patch
deleted file mode 100644
index 1263aafa2..000000000
--- a/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/remove-install-as-user.patch
+++ /dev/null
@@ -1,368 +0,0 @@
1diff -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
13diff -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
191diff -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.8.bb b/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb
deleted file mode 100644
index ba3490d1c..000000000
--- a/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb
+++ /dev/null
@@ -1,57 +0,0 @@
1DESCRIPTION = "XFS Filesystem Utilities"
2HOMEPAGE = "http://oss.sgi.com/projects/xfs"
3SECTION = "base"
4LICENSE = "GPLv2"
5LICENSE_libhandle = "LGPLv2.1"
6LIC_FILES_CHKSUM = "file://doc/COPYING;md5=dbdb5f4329b7e7145de650e9ecd4ac2a"
7DEPENDS = "util-linux"
8PR = "r1"
9
10SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz \
11 file://remove-install-as-user.patch \
12 file://drop-configure-check-for-aio.patch \
13"
14
15SRC_URI[md5sum] = "f70b2e7200d4c29f0af1cf70e7be1db6"
16SRC_URI[sha256sum] = "74409e2e3748074999df25c00f722621659a0bd3607e677f0bcc4373b8c93eab"
17
18inherit autotools
19
20PACKAGES =+ "${PN}-fsck ${PN}-mkfs libhandle"
21
22RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs"
23
24FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs"
25FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs"
26FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}"
27
28EXTRA_OECONF = "--enable-gettext=no"
29do_configure () {
30 # Prevent Makefile from calling configure without arguments,
31 # when do_configure gets called for a second time.
32 rm -f include/builddefs include/platform_defs.h
33 # Recreate configure script.
34 rm -f configure
35 oe_runmake configure
36 # Configure.
37 export DEBUG="-DNDEBUG"
38 gnu-configize --force
39 oe_runconf
40}
41
42LIBTOOL = "${HOST_SYS}-libtool"
43EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
44TARGET_CC_ARCH += "${LDFLAGS}"
45PARALLEL_MAKE = ""
46
47do_install () {
48 export DIST_ROOT=${D}
49 oe_runmake install
50 # needed for xfsdump
51 oe_runmake install-dev
52 rm ${D}${base_libdir}/libhandle.a
53 rm ${D}${base_libdir}/libhandle.la
54 rm ${D}${base_libdir}/libhandle.so
55 rm ${D}${libdir}/libhandle.so
56 ln -s ../..${base_libdir}/libhandle.so.1 ${D}${libdir}/libhandle.so
57}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 08:46:33 +0000