From c2fd59028a57356cff8d165edb71c45c3b05cc67 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 24 Mar 2013 07:35:57 +0000 Subject: coreutils: update to upstream version 8.21 remove-gets.patch removed as issue is fixed upstream. Signed-off-by: Marko Lindqvist Signed-off-by: Richard Purdie --- .../coreutils-8.14/coreutils-build-with-acl.patch | 28 -------- .../coreutils/coreutils-8.14/remove-gets.patch | 23 ------ .../remove-usr-local-lib-from-m4.patch | 31 -------- .../coreutils-8.21/coreutils-build-with-acl.patch | 28 ++++++++ .../coreutils/coreutils-8.21/dummy_help2man.patch | 22 ++++++ .../remove-usr-local-lib-from-m4.patch | 31 ++++++++ meta/recipes-core/coreutils/coreutils_8.14.bb | 83 --------------------- meta/recipes-core/coreutils/coreutils_8.21.bb | 84 ++++++++++++++++++++++ 8 files changed, 165 insertions(+), 165 deletions(-) delete mode 100644 meta/recipes-core/coreutils/coreutils-8.14/coreutils-build-with-acl.patch delete mode 100644 meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch delete mode 100644 meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch create mode 100644 meta/recipes-core/coreutils/coreutils-8.21/coreutils-build-with-acl.patch create mode 100644 meta/recipes-core/coreutils/coreutils-8.21/dummy_help2man.patch create mode 100644 meta/recipes-core/coreutils/coreutils-8.21/remove-usr-local-lib-from-m4.patch delete mode 100644 meta/recipes-core/coreutils/coreutils_8.14.bb create mode 100644 meta/recipes-core/coreutils/coreutils_8.21.bb diff --git a/meta/recipes-core/coreutils/coreutils-8.14/coreutils-build-with-acl.patch b/meta/recipes-core/coreutils/coreutils-8.14/coreutils-build-with-acl.patch deleted file mode 100644 index 8273d78eb3..0000000000 --- a/meta/recipes-core/coreutils/coreutils-8.14/coreutils-build-with-acl.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Fix the following issue so that coreutils can build with ACL: - -configure: WARNING: libacl development library was not found or not usable. -configure: WARNING: GNU coreutils will be built without ACL support. - -Signed-off-by: Jackie Huang ---- - m4/acl.m4 | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/m4/acl.m4 b/m4/acl.m4 -index d6a448a..a9d4836 100644 ---- a/m4/acl.m4 -+++ b/m4/acl.m4 -@@ -159,7 +159,7 @@ AC_DEFUN([gl_ACL_GET_FILE], - ]])], - [gl_cv_func_working_acl_get_file=yes], - [gl_cv_func_working_acl_get_file=no], -- [gl_cv_func_working_acl_get_file=cross-compiling])]) -+ [gl_cv_func_working_acl_get_file=yes])]) - - AS_IF([test $gl_cv_func_working_acl_get_file = yes], [$1], [$2]) - ]) --- -1.7.7 - diff --git a/meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch b/meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch deleted file mode 100644 index 4f61c92b15..0000000000 --- a/meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch +++ /dev/null @@ -1,23 +0,0 @@ -use gets iff its defined. eglibc 2.16 removed gets - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: coreutils-8.14/lib/stdio.in.h -=================================================================== ---- coreutils-8.14.orig/lib/stdio.in.h 2011-09-24 04:20:48.000000000 -0700 -+++ coreutils-8.14/lib/stdio.in.h 2012-07-03 10:36:19.886296576 -0700 -@@ -713,11 +713,13 @@ - _GL_CXXALIAS_SYS (gets, char *, (char *s)); - # undef gets - # endif -+# if defined gets - _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+# endif - #endif - - 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 deleted file mode 100644 index 2ef8a548ac..0000000000 --- a/meta/recipes-core/coreutils/coreutils-8.14/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.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.21/coreutils-build-with-acl.patch b/meta/recipes-core/coreutils/coreutils-8.21/coreutils-build-with-acl.patch new file mode 100644 index 0000000000..8273d78eb3 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.21/coreutils-build-with-acl.patch @@ -0,0 +1,28 @@ +Upstream-Status: Inappropriate [embedded specific] + +Fix the following issue so that coreutils can build with ACL: + +configure: WARNING: libacl development library was not found or not usable. +configure: WARNING: GNU coreutils will be built without ACL support. + +Signed-off-by: Jackie Huang +--- + m4/acl.m4 | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/m4/acl.m4 b/m4/acl.m4 +index d6a448a..a9d4836 100644 +--- a/m4/acl.m4 ++++ b/m4/acl.m4 +@@ -159,7 +159,7 @@ AC_DEFUN([gl_ACL_GET_FILE], + ]])], + [gl_cv_func_working_acl_get_file=yes], + [gl_cv_func_working_acl_get_file=no], +- [gl_cv_func_working_acl_get_file=cross-compiling])]) ++ [gl_cv_func_working_acl_get_file=yes])]) + + AS_IF([test $gl_cv_func_working_acl_get_file = yes], [$1], [$2]) + ]) +-- +1.7.7 + diff --git a/meta/recipes-core/coreutils/coreutils-8.21/dummy_help2man.patch b/meta/recipes-core/coreutils/coreutils-8.21/dummy_help2man.patch new file mode 100644 index 0000000000..4757f52aa0 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.21/dummy_help2man.patch @@ -0,0 +1,22 @@ +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Marko Lindqvist +diff -Nurd coreutils-8.21/man/local.mk coreutils-8.21/man/local.mk +--- coreutils-8.21/man/local.mk 2013-02-05 16:01:21.000000000 +0200 ++++ coreutils-8.21/man/local.mk 2013-03-23 09:12:53.360470192 +0200 +@@ -19,11 +19,11 @@ + EXTRA_DIST += man/help2man man/dummy-man + + ## Graceful degradation for systems lacking perl. +-if HAVE_PERL +-run_help2man = $(PERL) -- $(srcdir)/man/help2man +-else ++#if HAVE_PERL ++#run_help2man = $(PERL) -- $(srcdir)/man/help2man ++#else + run_help2man = $(SHELL) $(srcdir)/man/dummy-man +-endif ++#endif + + man1_MANS = @man1_MANS@ + EXTRA_DIST += $(man1_MANS:.1=.x) diff --git a/meta/recipes-core/coreutils/coreutils-8.21/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.21/remove-usr-local-lib-from-m4.patch new file mode 100644 index 0000000000..2ef8a548ac --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.21/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.14.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb deleted file mode 100644 index b82bbe4145..0000000000 --- a/meta/recipes-core/coreutils/coreutils_8.14.bb +++ /dev/null @@ -1,83 +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;beginline=5;endline=16;md5=2e9acd8818fe6db4c2981d20ca632553" -PR = "r5" -DEPENDS = "gmp libcap" -DEPENDS_class-native = "" - -inherit autotools gettext - -SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ - file://remove-usr-local-lib-from-m4.patch \ - file://remove-gets.patch \ - file://coreutils-build-with-acl.patch \ - " -SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a" -SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d" - -EXTRA_OECONF = "--disable-acl" -EXTRA_OECONF_class-native = "--disable-acl --without-gmp" - -# [ df mktemp base64 gets a special treatment and is not included in this -bindir_progs = "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 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 df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done - - install -d ${D}${base_bindir} - [ "${base_bindir}" != "${bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${BPN}; done - - install -d ${D}${sbindir} - [ "${sbindir}" != "${bindir}" ] && for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${BPN}; 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.${BPN} - install -d ${D}${libdir}/coreutils - mv ${D}${libexecdir}/coreutils/libstdbuf.so ${D}${libdir}/coreutils -} - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df" - -ALTERNATIVE_LINK_NAME[base64] = "${base_bindir}/base64" -ALTERNATIVE_TARGET[base64] = "${bindir}/base64.${BPN}" - -ALTERNATIVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp" -ALTERNATIVE_TARGET[mktemp] = "${bindir}/mktemp.${BPN}" - -ALTERNATIVE_LINK_NAME[df] = "${base_bindir}/df" -ALTERNATIVE_TARGET[df] = "${bindir}/df.${BPN}" - -ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/[" -ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}" - -python __anonymous() { - for prog in d.getVar('base_bindir_progs', True).split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog)) - - for prog in d.getVar('sbindir_progs', True).split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir', True), prog)) -} - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-core/coreutils/coreutils_8.21.bb b/meta/recipes-core/coreutils/coreutils_8.21.bb new file mode 100644 index 0000000000..e789f59f0b --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils_8.21.bb @@ -0,0 +1,84 @@ +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;beginline=5;endline=16;md5=38b79785ca88537b75871782a2a3c6b8" +PR = "r0" +DEPENDS = "gmp libcap" +DEPENDS_class-native = "" + +inherit autotools gettext + +SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ + file://remove-usr-local-lib-from-m4.patch \ + file://coreutils-build-with-acl.patch \ + file://dummy_help2man.patch \ + " + +SRC_URI[md5sum] = "065ba41828644eca5dd8163446de5d64" +SRC_URI[sha256sum] = "adaa44bdab3fa5eb352e80d8a31fdbf957b78653d0c2cd30d63e161444288e18" + +EXTRA_OECONF = "--disable-acl" +EXTRA_OECONF_class-native = "--disable-acl --without-gmp" + +# [ df mktemp base64 gets a special treatment and is not included in this +bindir_progs = "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 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 df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done + + install -d ${D}${base_bindir} + [ "${base_bindir}" != "${bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${BPN}; done + + install -d ${D}${sbindir} + [ "${sbindir}" != "${bindir}" ] && for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${BPN}; 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.${BPN} + install -d ${D}${libdir}/coreutils + mv ${D}${libexecdir}/coreutils/libstdbuf.so ${D}${libdir}/coreutils +} + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df" + +ALTERNATIVE_LINK_NAME[base64] = "${base_bindir}/base64" +ALTERNATIVE_TARGET[base64] = "${bindir}/base64.${BPN}" + +ALTERNATIVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp" +ALTERNATIVE_TARGET[mktemp] = "${bindir}/mktemp.${BPN}" + +ALTERNATIVE_LINK_NAME[df] = "${base_bindir}/df" +ALTERNATIVE_TARGET[df] = "${bindir}/df.${BPN}" + +ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/[" +ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}" + +python __anonymous() { + for prog in d.getVar('base_bindir_progs', True).split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog)) + + for prog in d.getVar('sbindir_progs', True).split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir', True), prog)) +} + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg