From 906c46d17146bc91e79999d861274e802e9fc745 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 20 Oct 2011 12:24:46 -0700 Subject: coreutils: Upgrade recipe 8.12 -> 8.14 Change in site files is needed since in cross build envrionment the test to check for gl_cv_func_fstatat_zero_flag is a runtime test Signed-off-by: Khem Raj --- .../remove-usr-local-lib-from-m4.patch | 31 --------- .../remove-usr-local-lib-from-m4.patch | 31 +++++++++ meta/recipes-core/coreutils/coreutils_8.12.bb | 78 --------------------- meta/recipes-core/coreutils/coreutils_8.14.bb | 79 ++++++++++++++++++++++ 4 files changed, 110 insertions(+), 109 deletions(-) delete mode 100644 meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch create mode 100644 meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch delete mode 100644 meta/recipes-core/coreutils/coreutils_8.12.bb create mode 100644 meta/recipes-core/coreutils/coreutils_8.14.bb (limited to 'meta/recipes-core/coreutils') diff --git a/meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch deleted file mode 100644 index aac097a4ce..0000000000 --- a/meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch +++ /dev/null @@ -1,31 +0,0 @@ -We have problem using hardcoded directories like /usr/local here -which will be checked for cross builds. This is a special case which -is valid for AIX only. We do not have AIX as one of our supported -build host or target. Therefore we get rid of the hardcoded paths -and make life easier for cross compilation process. - -Signed-off-by: Khem Raj - -Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] - -Index: coreutils-8.12/m4/getloadavg.m4 -=================================================================== ---- coreutils-8.12.orig/m4/getloadavg.m4 2011-08-03 14:03:59.982197767 -0700 -+++ coreutils-8.12/m4/getloadavg.m4 2011-08-03 14:04:20.402197763 -0700 -@@ -44,16 +44,6 @@ AC_CHECK_FUNC([getloadavg], [], - [LIBS="-lutil $LIBS" gl_have_func=yes]) - fi - -- if test $gl_have_func = no; then -- # There is a commonly available library for RS/6000 AIX. -- # Since it is not a standard part of AIX, it might be installed locally. -- gl_getloadavg_LIBS=$LIBS -- LIBS="-L/usr/local/lib $LIBS" -- AC_CHECK_LIB([getloadavg], [getloadavg], -- [LIBS="-lgetloadavg $LIBS" gl_have_func=yes], -- [LIBS=$gl_getloadavg_LIBS]) -- fi -- - # Set up the replacement function if necessary. - if test $gl_have_func = no; then - AC_LIBOBJ([getloadavg]) diff --git a/meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch new file mode 100644 index 0000000000..2ef8a548ac --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch @@ -0,0 +1,31 @@ +We have problem using hardcoded directories like /usr/local here +which will be checked for cross builds. This is a special case which +is valid for AIX only. We do not have AIX as one of our supported +build host or target. Therefore we get rid of the hardcoded paths +and make life easier for cross compilation process. + +Signed-off-by: Khem Raj + +Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] + +Index: coreutils-8.14/m4/getloadavg.m4 +=================================================================== +--- coreutils-8.14.orig/m4/getloadavg.m4 2011-09-19 08:09:24.000000000 -0700 ++++ coreutils-8.14/m4/getloadavg.m4 2011-10-19 21:42:00.385533357 -0700 +@@ -41,16 +41,6 @@ + [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes]) + fi + +- if test $gl_func_getloadavg_done = no; then +- # There is a commonly available library for RS/6000 AIX. +- # Since it is not a standard part of AIX, it might be installed locally. +- gl_getloadavg_LIBS=$LIBS +- LIBS="-L/usr/local/lib $LIBS" +- AC_CHECK_LIB([getloadavg], [getloadavg], +- [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], +- [LIBS=$gl_getloadavg_LIBS]) +- fi +- + # Set up the replacement function if necessary. + if test $gl_func_getloadavg_done = no; then + HAVE_GETLOADAVG=0 diff --git a/meta/recipes-core/coreutils/coreutils_8.12.bb b/meta/recipes-core/coreutils/coreutils_8.12.bb deleted file mode 100644 index 0004ce7fc8..0000000000 --- a/meta/recipes-core/coreutils/coreutils_8.12.bb +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY = "The basic file, shell and text manipulation utilities." -DESCRIPTION = "The GNU Core Utilities provide the basic file, shell and text \ -manipulation utilities. These are the core utilities which are expected to exist on \ -every system." -HOMEPAGE = "http://www.gnu.org/software/coreutils/" -BUGTRACKER = "http://debbugs.gnu.org/coreutils" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ - file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad" -PR = "r3" -DEPENDS = "gmp" -DEPENDS_virtclass-native = "" - -inherit autotools gettext - -SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.gz \ - file://remove-usr-local-lib-from-m4.patch \ - " - -SRC_URI[md5sum] = "fce7999953a67243d00d75cc86dbcaa6" -SRC_URI[sha256sum] = "9e233a62c98a3378a7b0483d2ae3d662dbaf6cd3917d3830d3514665e12a85c8" - -EXTRA_OECONF_virtclass-native = "--without-gmp" - -# [ gets a special treatment and is not included in this -bindir_progs = "base64 basename chcon cksum comm csplit cut dir dircolors dirname du \ - env expand expr factor fmt fold groups head hostid id install \ - join link logname md5sum mkfifo mktemp nice nl nohup nproc od paste pathchk \ - pinky pr printenv printf ptx readlink runcon seq sha1sum sha224sum sha256sum \ - sha384sum sha512sum shred shuf sort split stat stdbuf sum tac tail tee test timeout\ - tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes" - -# hostname gets a special treatment and is not included in this -base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \ - mknod mv pwd rm rmdir sleep stty sync touch true uname" - -sbindir_progs= "chroot" - -do_install_append() { - for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done - - install -d ${D}${base_bindir} - for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done - - install -d ${D}${sbindir} - for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done - - # [ requires special handling because [.coreutils will cause the sed stuff - # in update-alternatives to fail, therefore use lbracket - the name used - # for the actual source file. - mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN} -} - -pkg_postinst_${PN} () { - for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done - - for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done - - for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done - - # Special cases. [ needs to be treated separately. - update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 -} - -pkg_prerm_${PN} () { - for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done - - for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done - - for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done - - # The special cases - update-alternatives --remove hostname hostname.${PN} - update-alternatives --remove uptime uptime.${PN} - update-alternatives --remove '[' 'lbracket.${PN}' -} - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-core/coreutils/coreutils_8.14.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb new file mode 100644 index 0000000000..f3b7af7d13 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils_8.14.bb @@ -0,0 +1,79 @@ +SUMMARY = "The basic file, shell and text manipulation utilities." +DESCRIPTION = "The GNU Core Utilities provide the basic file, shell and text \ +manipulation utilities. These are the core utilities which are expected to exist on \ +every system." +HOMEPAGE = "http://www.gnu.org/software/coreutils/" +BUGTRACKER = "http://debbugs.gnu.org/coreutils" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ + file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad" +PR = "r0" +DEPENDS = "gmp" +DEPENDS_virtclass-native = "" + +inherit autotools gettext + +SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ + file://remove-usr-local-lib-from-m4.patch \ + " +SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a" +SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d" + +EXTRA_OECONF_virtclass-native = "--without-gmp" + +# [ gets a special treatment and is not included in this +bindir_progs = "base64 basename chcon cksum comm csplit cut dir dircolors dirname du \ + env expand expr factor fmt fold groups head hostid id install \ + join link logname md5sum mkfifo mktemp nice nl nohup nproc od paste pathchk \ + pinky pr printenv printf ptx readlink runcon seq sha1sum sha224sum sha256sum \ + sha384sum sha512sum shred shuf sort split stat stdbuf sum tac tail tee test timeout\ + tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes" + +# hostname gets a special treatment and is not included in this +base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \ + mknod mv pwd rm rmdir sleep stty sync touch true uname" + +sbindir_progs= "chroot" + +do_install_append() { + for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done + + install -d ${D}${base_bindir} + for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done + + install -d ${D}${sbindir} + for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done + + # [ requires special handling because [.coreutils will cause the sed stuff + # in update-alternatives to fail, therefore use lbracket - the name used + # for the actual source file. + mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN} + install -d ${D}${libdir}/coreutils + mv ${D}${libexecdir}/coreutils/libstdbuf.so ${D}${libdir}/coreutils +} + +pkg_postinst_${PN} () { + for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done + + for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done + + for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done + + # Special cases. [ needs to be treated separately. + update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 +} + +pkg_prerm_${PN} () { + for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done + + for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done + + for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done + + # The special cases + update-alternatives --remove hostname hostname.${PN} + update-alternatives --remove uptime uptime.${PN} + update-alternatives --remove '[' 'lbracket.${PN}' +} + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg