From eefdbbec6c9c176ac6060ec33303b45660fd4e32 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 14 Aug 2013 06:31:01 +0000 Subject: 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 Signed-off-by: Martin Jansa --- .../files/drop-configure-check-for-aio.patch | 93 ++++++ .../xfsprogs/files/remove-install-as-user.patch | 205 ++++++++++++ .../recipes-utils/xfsprogs/xfsprogs_3.1.11.bb | 56 ++++ .../drop-configure-check-for-aio.patch | 99 ------ .../xfsprogs-3.1.8/remove-install-as-user.patch | 368 --------------------- meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb | 57 ---- 6 files changed, 354 insertions(+), 524 deletions(-) create mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/drop-configure-check-for-aio.patch create mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/remove-install-as-user.patch create mode 100644 meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb delete mode 100644 meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/drop-configure-check-for-aio.patch delete mode 100644 meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/remove-install-as-user.patch delete mode 100644 meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/drop-configure-check-for-aio.patch b/meta-filesystems/recipes-utils/xfsprogs/files/drop-configure-check-for-aio.patch new file mode 100644 index 0000000000..760109506c --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/drop-configure-check-for-aio.patch @@ -0,0 +1,93 @@ +xfsprogs: drop configure check for aio + +It's unused and breaks compilation with uclibc. + +Upstream-Status: Pending +Signed-off-by: Hongxu Jia +--- + configure.ac | 6 +++--- + m4/Makefile | 1 - + m4/package_aiodev.m4 | 36 ------------------------------------ + 3 files changed, 3 insertions(+), 40 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b968977..4e2a263 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -47,6 +47,9 @@ AC_ARG_ENABLE(lib64, + enable_lib64=yes) + AC_SUBST(enable_lib64) + ++librt="-lrt" ++AC_SUBST(librt) ++ + # + # If the user specified a libdir ending in lib64 do not append another + # 64 to the library names. +@@ -92,9 +95,6 @@ AC_PACKAGE_GLOBALS(xfsprogs) + AC_PACKAGE_UTILITIES(xfsprogs) + AC_MULTILIB($enable_lib64) + +-AC_PACKAGE_NEED_AIO_H +-AC_PACKAGE_NEED_LIO_LISTIO +- + AC_PACKAGE_NEED_UUID_H + AC_PACKAGE_NEED_UUIDCOMPARE + +diff --git a/m4/Makefile b/m4/Makefile +index 654a4fb..d282f0a 100644 +--- a/m4/Makefile ++++ b/m4/Makefile +@@ -14,7 +14,6 @@ CONFIGURE = \ + + LSRCFILES = \ + manual_format.m4 \ +- package_aiodev.m4 \ + package_blkid.m4 \ + package_globals.m4 \ + package_libcdev.m4 \ +diff --git a/m4/package_aiodev.m4 b/m4/package_aiodev.m4 +index 490d9c8..8b13789 100644 +--- a/m4/package_aiodev.m4 ++++ b/m4/package_aiodev.m4 +@@ -1,37 +1 @@ +-# +-# Check if we have a libaio.h installed +-# +-AC_DEFUN([AC_PACKAGE_WANT_AIO], +- [ AC_CHECK_HEADERS(libaio.h, [ have_aio=true ], [ have_aio=false ]) +- AC_SUBST(have_aio) +- ]) +- +-# +-# Check if we have an aio.h installed +-# +-AC_DEFUN([AC_PACKAGE_NEED_AIO_H], +- [ AC_CHECK_HEADERS(aio.h) +- if test $ac_cv_header_aio_h = no; then +- echo +- echo 'FATAL ERROR: could not find a valid header.' +- exit 1 +- fi +- ]) +- +-# +-# Check if we have the lio_listio routine in either libc/librt +-# +-AC_DEFUN([AC_PACKAGE_NEED_LIO_LISTIO], +- [ AC_CHECK_FUNCS(lio_listio) +- if test $ac_cv_func_lio_listio = yes; then +- librt="" +- else +- AC_CHECK_LIB(rt, lio_listio,, [ +- echo +- echo 'FATAL ERROR: could not find a library with lio_listio.' +- exit 1],[-lpthread]) +- librt="-lrt" +- fi +- AC_SUBST(librt) +- ]) + +-- +1.8.1.2 + diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/remove-install-as-user.patch b/meta-filesystems/recipes-utils/xfsprogs/files/remove-install-as-user.patch new file mode 100644 index 0000000000..e761db371f --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/remove-install-as-user.patch @@ -0,0 +1,205 @@ +remove install as user + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Hongxu Jia +--- + include/buildmacros | 2 +- + include/install-sh | 95 ++++++++--------------------------------------------- + 2 files changed, 14 insertions(+), 83 deletions(-) + +diff --git a/include/buildmacros b/include/buildmacros +index 7a01880..0840d55 100644 +--- a/include/buildmacros ++++ b/include/buildmacros +@@ -30,7 +30,7 @@ OBJECTS = $(ASFILES:.s=.o) \ + $(LFILES:.l=.o) \ + $(YFILES:%.y=%.tab.o) + +-INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) ++INSTALL = $(TOPDIR)/install-sh + + IMAGES_DIR = $(TOPDIR)/all-images + DIST_DIR = $(TOPDIR)/dist +diff --git a/include/install-sh b/include/install-sh +index c952a71..b9d66f7 100755 +--- a/include/install-sh ++++ b/include/install-sh +@@ -24,11 +24,11 @@ + # set set | yes yes + # + _usage() { +- echo "Usage: $prog [-o owner] [-g group] [-m mode] -d directory" +- echo "or $prog [-D] [-o owner] [-g group] [-m mode] file directory/file" +- echo "or $prog [-o owner] [-g group] [-m mode] file [file ...] directory" ++ echo "Usage: $prog [-m mode] -d directory" ++ echo "or $prog [-m mode] file directory/file" ++ echo "or $prog [-m mode] file [file ...] directory" + echo "or $prog -S file target (creates \"target\" symlink)" +- echo "or $prog -T lt_arg [-o owner] [-g group] [-m mode] libtool.lai directory" ++ echo "or $prog -T lt_arg [-m mode] libtool.lai directory" + echo "" + echo "The \$DIST_MANIFEST and \$DIST_ROOT environment variables affect the" + echo "behaviour of this command - see comments in the script." +@@ -38,32 +38,6 @@ _usage() { + exit 1 + } + +-_chown () +-{ +- _st=255 +- if [ $# -eq 3 ] ; then +- chown $1:$2 $3 +- _st=$? +- if [ $_st -ne 0 ] ; then +- if [ $REAL_UID != '0' ] ; then +- if [ ! -f $DIST_ROOT/.chown.quiet ] ; then +- echo '===============================================' +- echo Ownership of files under ${DIST_ROOT:-/} +- echo cannot be changed +- echo '===============================================' +- if [ -n "$DIST_ROOT" ] ; then +- touch $DIST_ROOT/.chown.quiet +- fi +- fi +- _st=0 +- fi +- fi +- fi +- +- return $_st +-} +- +- + _manifest () + { + echo $* | sed -e 's/\/\//\//g' >>${DIST_MANIFEST:-/dev/null} +@@ -77,9 +51,6 @@ Sflag=false + Tflag=false + DIRMODE=755 + FILEMODE=644 +-OWNER=`id -u` +-GROUP=`id -g` +-REAL_UID=$OWNER + + # default is to install and don't append manifest + INSTALL=true +@@ -94,24 +65,16 @@ MANIFEST=: + + if $INSTALL + then +- CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown ++ CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; + else +- CP=true; LN=true; MKDIR=true; CHMOD=true; CHOWN=true ++ CP=true; LN=true; MKDIR=true; CHMOD=true; + fi + +-[ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true +- +-while getopts "Dcm:d:S:o:g:T:" c $* ++while getopts "Dcm:d:S:T:" c $* + do + case $c in + c) + ;; +- g) +- GROUP=$OPTARG +- ;; +- o) +- OWNER=$OPTARG +- ;; + m) + DIRMODE=`expr $OPTARG` + FILEMODE=$DIRMODE +@@ -146,18 +109,7 @@ then + # first usage + # + $MKDIR -p $dir +- status=$? +- if [ $status -eq 0 ] +- then +- $CHMOD $DIRMODE $dir +- status=$? +- fi +- if [ $status -eq 0 ] +- then +- $CHOWN $OWNER $GROUP $dir +- status=$? +- fi +- $MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT} ++ $MANIFEST d $DIRMODE ${dir#$DIST_ROOT} + elif $Sflag + then + # +@@ -203,7 +155,7 @@ then + install_name=$target/$solib + $CP $solib $install_name + status=$? +- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT} ++ $MANIFEST f $FILEMODE $HERE/$solib ${install_name#$DIST_ROOT} + break + fi + done +@@ -254,7 +206,7 @@ then + install_name=$target/$old_library + $CP $old_library $install_name + status=$? +- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT} ++ $MANIFEST f $FILEMODE $HERE/$old_library ${install_name#$DIST_ROOT} + ;; + *) + echo "$prog: -T $lt_install invalid" +@@ -267,7 +219,6 @@ then + if [ $status -eq 0 ] + then + $CHMOD $FILEMODE $install_name +- $CHOWN $OWNER $GROUP $install_name + fi + ;; + esac +@@ -292,23 +243,10 @@ else + then + if [ -f $dir/$f ] + then +- $CHMOD $FILEMODE $dir/$f +- status=$? +- if [ $status -eq 0 ] +- then +- $CHOWN $OWNER $GROUP $dir/$f +- status=$? +- fi +- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f ++ $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f + else + $CHMOD $FILEMODE $dir +- status=$? +- if [ $status -eq 0 ] +- then +- $CHOWN $OWNER $GROUP $dir +- status=$? +- fi +- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$dir ${dir#$DIST_ROOT} ++ $MANIFEST f $FILEMODE $HERE/$dir ${dir#$DIST_ROOT} + fi + fi + else +@@ -334,14 +272,7 @@ else + status=$? + if [ $status -eq 0 ] + then +- $CHMOD $FILEMODE $dir/$f +- status=$? +- if [ $status -eq 0 ] +- then +- $CHOWN $OWNER $GROUP $dir/$f +- status=$? +- fi +- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f ++ $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f + fi + [ $status -ne 0 ] && break + done +-- +1.8.1.2 + diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb new file mode 100644 index 0000000000..ceb0ddf161 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb @@ -0,0 +1,56 @@ +DESCRIPTION = "XFS Filesystem Utilities" +HOMEPAGE = "http://oss.sgi.com/projects/xfs" +SECTION = "base" +LICENSE = "GPLv2" +LICENSE_libhandle = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=dbdb5f4329b7e7145de650e9ecd4ac2a" +DEPENDS = "util-linux" + +SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz \ + file://remove-install-as-user.patch \ + file://drop-configure-check-for-aio.patch \ +" + +SRC_URI[md5sum] = "de9f1f45026c2f4e0776058d429ff4b6" +SRC_URI[sha256sum] = "adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be" + +inherit autotools + +PACKAGES =+ "${PN}-fsck ${PN}-mkfs libhandle" + +RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs" + +FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" +FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" +FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" + +EXTRA_OECONF = "--enable-gettext=no" +do_configure () { + # Prevent Makefile from calling configure without arguments, + # when do_configure gets called for a second time. + rm -f include/builddefs include/platform_defs.h + # Recreate configure script. + rm -f configure + oe_runmake configure + # Configure. + export DEBUG="-DNDEBUG" + gnu-configize --force + oe_runconf +} + +LIBTOOL = "${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +TARGET_CC_ARCH += "${LDFLAGS}" +PARALLEL_MAKE = "" + +do_install () { + export DIST_ROOT=${D} + oe_runmake install + # needed for xfsdump + oe_runmake install-dev + rm ${D}${base_libdir}/libhandle.a + rm ${D}${base_libdir}/libhandle.la + rm ${D}${base_libdir}/libhandle.so + rm ${D}${libdir}/libhandle.so + ln -s ../..${base_libdir}/libhandle.so.1 ${D}${libdir}/libhandle.so +} 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 a1c60424ad..0000000000 --- a/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/drop-configure-check-for-aio.patch +++ /dev/null @@ -1,99 +0,0 @@ -Upstream-Status: Pending - -From a38bf800a655ea32cbddd6504e15c2f18597fd13 Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter -Date: Wed, 13 Mar 2013 14:40:13 +0100 -Subject: [PATCH] xfsprogs: drop configure check for aio - -It's unused and breaks compilation with uclibc. - -Signed-off-by: Andreas Oberritter ---- - configure.in | 6 +++--- - m4/Makefile | 1 - - m4/package_aiodev.m4 | 37 ------------------------------------- - 3 files changed, 3 insertions(+), 41 deletions(-) - delete mode 100644 m4/package_aiodev.m4 - -diff --git a/configure.in b/configure.in -index 664c0e9..f7d35f1 100644 ---- a/configure.in -+++ b/configure.in -@@ -46,6 +46,9 @@ AC_ARG_ENABLE(lib64, - enable_lib64=yes) - AC_SUBST(enable_lib64) - -+librt="-lrt" -+AC_SUBST(librt) -+ - # - # If the user specified a libdir ending in lib64 do not append another - # 64 to the library names. -@@ -91,9 +94,6 @@ AC_PACKAGE_GLOBALS(xfsprogs) - AC_PACKAGE_UTILITIES(xfsprogs) - AC_MULTILIB($enable_lib64) - --AC_PACKAGE_NEED_AIO_H --AC_PACKAGE_NEED_LIO_LISTIO -- - AC_PACKAGE_NEED_UUID_H - AC_PACKAGE_NEED_UUIDCOMPARE - -diff --git a/m4/Makefile b/m4/Makefile -index 654a4fb..d282f0a 100644 ---- a/m4/Makefile -+++ b/m4/Makefile -@@ -14,7 +14,6 @@ CONFIGURE = \ - - LSRCFILES = \ - manual_format.m4 \ -- package_aiodev.m4 \ - package_blkid.m4 \ - package_globals.m4 \ - package_libcdev.m4 \ -diff --git a/m4/package_aiodev.m4 b/m4/package_aiodev.m4 -deleted file mode 100644 -index 490d9c8..0000000 ---- a/m4/package_aiodev.m4 -+++ /dev/null -@@ -1,37 +0,0 @@ --# --# Check if we have a libaio.h installed --# --AC_DEFUN([AC_PACKAGE_WANT_AIO], -- [ AC_CHECK_HEADERS(libaio.h, [ have_aio=true ], [ have_aio=false ]) -- AC_SUBST(have_aio) -- ]) -- --# --# Check if we have an aio.h installed --# --AC_DEFUN([AC_PACKAGE_NEED_AIO_H], -- [ AC_CHECK_HEADERS(aio.h) -- if test $ac_cv_header_aio_h = no; then -- echo -- echo 'FATAL ERROR: could not find a valid header.' -- exit 1 -- fi -- ]) -- --# --# Check if we have the lio_listio routine in either libc/librt --# --AC_DEFUN([AC_PACKAGE_NEED_LIO_LISTIO], -- [ AC_CHECK_FUNCS(lio_listio) -- if test $ac_cv_func_lio_listio = yes; then -- librt="" -- else -- AC_CHECK_LIB(rt, lio_listio,, [ -- echo -- echo 'FATAL ERROR: could not find a library with lio_listio.' -- exit 1],[-lpthread]) -- librt="-lrt" -- fi -- AC_SUBST(librt) -- ]) -- --- -1.7.10.4 - 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 1263aafa22..0000000000 --- a/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/remove-install-as-user.patch +++ /dev/null @@ -1,368 +0,0 @@ -diff -urN a/include/buildmacros b/include/buildmacros ---- a/include/buildmacros 2011-12-27 23:32:31.554197934 -0600 -+++ b/include/buildmacros 2011-12-27 23:33:17.895485348 -0600 -@@ -30,7 +30,7 @@ - $(LFILES:.l=.o) \ - $(YFILES:%.y=%.tab.o) - --INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -+INSTALL = $(TOPDIR)/install-sh - - IMAGES_DIR = $(TOPDIR)/all-images - DIST_DIR = $(TOPDIR)/dist -diff -urN a/include/install-sh b/include/install-sh ---- a/include/install-sh 2011-12-27 23:32:31.556198121 -0600 -+++ b/include/install-sh 2011-12-27 23:32:57.012201738 -0600 -@@ -24,11 +24,11 @@ - # set set | yes yes - # - _usage() { -- echo "Usage: $prog [-o owner] [-g group] [-m mode] -d directory" -- echo "or $prog [-D] [-o owner] [-g group] [-m mode] file directory/file" -- echo "or $prog [-o owner] [-g group] [-m mode] file [file ...] directory" -+ echo "Usage: $prog [-m mode] -d directory" -+ echo "or $prog [-m mode] file directory/file" -+ echo "or $prog [-m mode] file [file ...] directory" - echo "or $prog -S file target (creates \"target\" symlink)" -- echo "or $prog -T lt_arg [-o owner] [-g group] [-m mode] libtool.lai directory" -+ echo "or $prog -T lt_arg [-m mode] libtool.lai directory" - echo "" - echo "The \$DIST_MANIFEST and \$DIST_ROOT environment variables affect the" - echo "behaviour of this command - see comments in the script." -@@ -38,32 +38,6 @@ - exit 1 - } - --_chown () --{ -- _st=255 -- if [ $# -eq 3 ] ; then -- chown $1:$2 $3 -- _st=$? -- if [ $_st -ne 0 ] ; then -- if [ $REAL_UID != '0' ] ; then -- if [ ! -f $DIST_ROOT/.chown.quiet ] ; then -- echo '===============================================' -- echo Ownership of files under ${DIST_ROOT:-/} -- echo cannot be changed -- echo '===============================================' -- if [ -n "$DIST_ROOT" ] ; then -- touch $DIST_ROOT/.chown.quiet -- fi -- fi -- _st=0 -- fi -- fi -- fi -- -- return $_st --} -- -- - _manifest () - { - echo $* | sed -e 's/\/\//\//g' >>${DIST_MANIFEST:-/dev/null} -@@ -77,9 +51,6 @@ - Tflag=false - DIRMODE=755 - FILEMODE=644 --OWNER=`id -u` --GROUP=`id -g` --REAL_UID=$OWNER - - # default is to install and don't append manifest - INSTALL=true -@@ -92,24 +63,16 @@ - - if $INSTALL - then -- CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown -+ CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; - else -- CP=true; LN=true; MKDIR=true; CHMOD=true; CHOWN=true -+ CP=true; LN=true; MKDIR=true; CHMOD=true; - fi - --[ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true -- --while getopts "Dcm:d:S:o:g:T:" c $* -+while getopts "Dcm:d:S:T:" c $* - do - case $c in - c) - ;; -- g) -- GROUP=$OPTARG -- ;; -- o) -- OWNER=$OPTARG -- ;; - m) - DIRMODE=`expr $OPTARG` - FILEMODE=$DIRMODE -@@ -144,18 +107,7 @@ - # first usage - # - $MKDIR -p $dir -- status=$? -- if [ $status -eq 0 ] -- then -- $CHMOD $DIRMODE $dir -- status=$? -- fi -- if [ $status -eq 0 ] -- then -- $CHOWN $OWNER $GROUP $dir -- status=$? -- fi -- $MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT} -+ $MANIFEST d $DIRMODE ${dir#$DIST_ROOT} - elif $Sflag - then - # -@@ -201,7 +153,7 @@ - install_name=$target/$solib - $CP $solib $install_name - status=$? -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT} -+ $MANIFEST f $FILEMODE $HERE/$solib ${install_name#$DIST_ROOT} - break - fi - done -@@ -252,7 +204,7 @@ - install_name=$target/$old_library - $CP $old_library $install_name - status=$? -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT} -+ $MANIFEST f $FILEMODE $HERE/$old_library ${install_name#$DIST_ROOT} - ;; - *) - echo "$prog: -T $lt_install invalid" -@@ -265,7 +217,6 @@ - if [ $status -eq 0 ] - then - $CHMOD $FILEMODE $install_name -- $CHOWN $OWNER $GROUP $install_name - fi - ;; - esac -@@ -290,23 +241,10 @@ - then - if [ -f $dir/$f ] - then -- $CHMOD $FILEMODE $dir/$f -- status=$? -- if [ $status -eq 0 ] -- then -- $CHOWN $OWNER $GROUP $dir/$f -- status=$? -- fi -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f -+ $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f - else - $CHMOD $FILEMODE $dir -- status=$? -- if [ $status -eq 0 ] -- then -- $CHOWN $OWNER $GROUP $dir -- status=$? -- fi -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$dir ${dir#$DIST_ROOT} -+ $MANIFEST f $FILEMODE $HERE/$dir ${dir#$DIST_ROOT} - fi - fi - else -@@ -332,14 +270,7 @@ - status=$? - if [ $status -eq 0 ] - then -- $CHMOD $FILEMODE $dir/$f -- status=$? -- if [ $status -eq 0 ] -- then -- $CHOWN $OWNER $GROUP $dir/$f -- status=$? -- fi -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f -+ $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f - fi - [ $status -ne 0 ] && break - done -diff -urN a/install-sh b/install-sh ---- a/install-sh 2011-12-27 23:32:31.565200349 -0600 -+++ b/install-sh 2011-12-27 23:32:51.854178224 -0600 -@@ -24,11 +24,11 @@ - # set set | yes yes - # - _usage() { -- echo "Usage: $prog [-o owner] [-g group] [-m mode] -d directory" -- echo "or $prog [-D] [-o owner] [-g group] [-m mode] file directory/file" -- echo "or $prog [-o owner] [-g group] [-m mode] file [file ...] directory" -+ echo "Usage: $prog [-m mode] -d directory" -+ echo "or $prog [-m mode] file directory/file" -+ echo "or $prog [-m mode] file [file ...] directory" - echo "or $prog -S file target (creates \"target\" symlink)" -- echo "or $prog -T lt_arg [-o owner] [-g group] [-m mode] libtool.lai directory" -+ echo "or $prog -T lt_arg [-m mode] libtool.lai directory" - echo "" - echo "The \$DIST_MANIFEST and \$DIST_ROOT environment variables affect the" - echo "behaviour of this command - see comments in the script." -@@ -38,32 +38,6 @@ - exit 1 - } - --_chown () --{ -- _st=255 -- if [ $# -eq 3 ] ; then -- chown $1:$2 $3 -- _st=$? -- if [ $_st -ne 0 ] ; then -- if [ $REAL_UID != '0' ] ; then -- if [ ! -f $DIST_ROOT/.chown.quiet ] ; then -- echo '===============================================' -- echo Ownership of files under ${DIST_ROOT:-/} -- echo cannot be changed -- echo '===============================================' -- if [ -n "$DIST_ROOT" ] ; then -- touch $DIST_ROOT/.chown.quiet -- fi -- fi -- _st=0 -- fi -- fi -- fi -- -- return $_st --} -- -- - _manifest () - { - echo $* | sed -e 's/\/\//\//g' >>${DIST_MANIFEST:-/dev/null} -@@ -77,9 +51,6 @@ - Tflag=false - DIRMODE=755 - FILEMODE=644 --OWNER=`id -u` --GROUP=`id -g` --REAL_UID=$OWNER - - # default is to install and don't append manifest - INSTALL=true -@@ -92,24 +63,16 @@ - - if $INSTALL - then -- CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown -+ CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; - else -- CP=true; LN=true; MKDIR=true; CHMOD=true; CHOWN=true -+ CP=true; LN=true; MKDIR=true; CHMOD=true; - fi - --[ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true -- --while getopts "Dcm:d:S:o:g:T:" c $* -+while getopts "Dcm:d:S:T:" c $* - do - case $c in - c) - ;; -- g) -- GROUP=$OPTARG -- ;; -- o) -- OWNER=$OPTARG -- ;; - m) - DIRMODE=`expr $OPTARG` - FILEMODE=$DIRMODE -@@ -144,18 +107,7 @@ - # first usage - # - $MKDIR -p $dir -- status=$? -- if [ $status -eq 0 ] -- then -- $CHMOD $DIRMODE $dir -- status=$? -- fi -- if [ $status -eq 0 ] -- then -- $CHOWN $OWNER $GROUP $dir -- status=$? -- fi -- $MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT} -+ $MANIFEST d $DIRMODE ${dir#$DIST_ROOT} - elif $Sflag - then - # -@@ -201,7 +153,7 @@ - install_name=$target/$solib - $CP $solib $install_name - status=$? -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT} -+ $MANIFEST f $FILEMODE $HERE/$solib ${install_name#$DIST_ROOT} - break - fi - done -@@ -252,7 +204,7 @@ - install_name=$target/$old_library - $CP $old_library $install_name - status=$? -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT} -+ $MANIFEST f $FILEMODE $HERE/$old_library ${install_name#$DIST_ROOT} - ;; - *) - echo "$prog: -T $lt_install invalid" -@@ -265,7 +217,6 @@ - if [ $status -eq 0 ] - then - $CHMOD $FILEMODE $install_name -- $CHOWN $OWNER $GROUP $install_name - fi - ;; - esac -@@ -290,23 +241,10 @@ - then - if [ -f $dir/$f ] - then -- $CHMOD $FILEMODE $dir/$f -- status=$? -- if [ $status -eq 0 ] -- then -- $CHOWN $OWNER $GROUP $dir/$f -- status=$? -- fi -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f -+ $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f - else - $CHMOD $FILEMODE $dir -- status=$? -- if [ $status -eq 0 ] -- then -- $CHOWN $OWNER $GROUP $dir -- status=$? -- fi -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$dir ${dir#$DIST_ROOT} -+ $MANIFEST f $FILEMODE $HERE/$dir ${dir#$DIST_ROOT} - fi - fi - else -@@ -332,14 +270,7 @@ - status=$? - if [ $status -eq 0 ] - then -- $CHMOD $FILEMODE $dir/$f -- status=$? -- if [ $status -eq 0 ] -- then -- $CHOWN $OWNER $GROUP $dir/$f -- status=$? -- fi -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f -+ $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f - fi - [ $status -ne 0 ] && break - 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 ba3490d1c3..0000000000 --- a/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION = "XFS Filesystem Utilities" -HOMEPAGE = "http://oss.sgi.com/projects/xfs" -SECTION = "base" -LICENSE = "GPLv2" -LICENSE_libhandle = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=dbdb5f4329b7e7145de650e9ecd4ac2a" -DEPENDS = "util-linux" -PR = "r1" - -SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz \ - file://remove-install-as-user.patch \ - file://drop-configure-check-for-aio.patch \ -" - -SRC_URI[md5sum] = "f70b2e7200d4c29f0af1cf70e7be1db6" -SRC_URI[sha256sum] = "74409e2e3748074999df25c00f722621659a0bd3607e677f0bcc4373b8c93eab" - -inherit autotools - -PACKAGES =+ "${PN}-fsck ${PN}-mkfs libhandle" - -RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs" - -FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" -FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" -FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" - -EXTRA_OECONF = "--enable-gettext=no" -do_configure () { - # Prevent Makefile from calling configure without arguments, - # when do_configure gets called for a second time. - rm -f include/builddefs include/platform_defs.h - # Recreate configure script. - rm -f configure - oe_runmake configure - # Configure. - export DEBUG="-DNDEBUG" - gnu-configize --force - oe_runconf -} - -LIBTOOL = "${HOST_SYS}-libtool" -EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" -TARGET_CC_ARCH += "${LDFLAGS}" -PARALLEL_MAKE = "" - -do_install () { - export DIST_ROOT=${D} - oe_runmake install - # needed for xfsdump - oe_runmake install-dev - rm ${D}${base_libdir}/libhandle.a - rm ${D}${base_libdir}/libhandle.la - rm ${D}${base_libdir}/libhandle.so - rm ${D}${libdir}/libhandle.so - ln -s ../..${base_libdir}/libhandle.so.1 ${D}${libdir}/libhandle.so -} -- cgit 1.2.3-korg