diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-core/coreutils')
8 files changed, 73 insertions, 12 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils_fix_for_automake-1.12.patch b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils_fix_for_automake-1.12.patch index 02730dbbb..64e5f12ba 100644 --- a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils_fix_for_automake-1.12.patch +++ b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils_fix_for_automake-1.12.patch @@ -11,7 +11,7 @@ this patch avoids these kinds of errors: | configure.ac:40: the top level | autom4te: m4 failed with exit status: 1 -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2012/05/04 Index: coreutils-6.9/m4/jm-macros.m4 diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch index 5ca590bcc..508810623 100644 --- a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch +++ b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch @@ -3,7 +3,7 @@ Upstream-Status: Inappropriate [legacy version] # coreutils uses gnulib which conflicts with newer libc header on futimens # this patch simply renames coreutils futimes to avoid confliction # -# Signed-off-by Kevin Tian <kevin.tian@intel.com>, 2010-08-18 +# Signed-off-by: Kevin Tian <kevin.tian@intel.com>, 2010-08-18 # (this patch is licensed under GPLv2) diff --git a/lib/utimens.c b/lib/utimens.c diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/gnulib_m4.patch b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/gnulib_m4.patch index 8f355520b..8a8ffa726 100644 --- a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/gnulib_m4.patch +++ b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/gnulib_m4.patch @@ -3,7 +3,7 @@ Upstream-Status: Inappropriate [legacy version] # remove the line to cause recursive inclusion error from autoreconf, sicne # newer autoconf has included this definition. Simply rename it here. # -# Signed-off-by Kevin Tian <kevin.tian@intel.com>, 2010-08-18 +# Signed-off-by: Kevin Tian <kevin.tian@intel.com>, 2010-08-18 # (this patch is licensed under GPLv2) diff --git a/extensions.m4 b/extensions.m4 diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/man-touch.patch b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/man-touch.patch index c42cb9c05..59a4fe005 100644 --- a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/man-touch.patch +++ b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/man-touch.patch @@ -6,7 +6,7 @@ Upstream-Status: Inappropriate [legacy version] # is with target format which can't be invoked on build system, disable building # 'touch' man page here. # -# Signed-off-by Kevin Tian <kevin.tian@intel.com>, 2010-08-18 +# Signed-off-by: Kevin Tian <kevin.tian@intel.com>, 2010-08-18 # (this patch is licensed under GPLv2) diff --git a/man/Makefile.am b/man/Makefile.am diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-8.25/0001-uname-report-processor-and-hardware-correctly.patch b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-8.25/0001-uname-report-processor-and-hardware-correctly.patch index c5f449f4f..3c43e1d5d 100644 --- a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-8.25/0001-uname-report-processor-and-hardware-correctly.patch +++ b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-8.25/0001-uname-report-processor-and-hardware-correctly.patch @@ -1,4 +1,4 @@ -Upstream-Status: Rejected +Upstream-Status: Denied Subject: uname: report processor and hardware correctly diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-8.25/disable-ls-output-quoting.patch b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-8.25/disable-ls-output-quoting.patch new file mode 100644 index 000000000..e68c21355 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils-8.25/disable-ls-output-quoting.patch @@ -0,0 +1,49 @@ +Subject: revert inconsistent ls quoting + +This is a revert of upstream commit 109b9220cead6e979d22d16327c4d9f8350431cc. + +Bug-Debian: https://bugs.debian.org/813164 + +Upstream-Status: Submitted + +Originally-by: Adam Borowski <kilobyte@angband.pl> +[PG: patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813164#78 ] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> + +--- + +--- coreutils-8.25.orig/NEWS ++++ coreutils-8.25/NEWS +@@ -71,9 +71,6 @@ GNU coreutils NEWS + df now prefers sources towards the root of a device when + eliding duplicate bind mounted entries. + +- ls now quotes file names unambiguously and appropriate for use in a shell, +- when outputting to a terminal. +- + join, sort, uniq with --zero-terminated, now treat '\n' as a field delimiter. + + ** Improvements +--- coreutils-8.25.orig/doc/coreutils.texi ++++ coreutils-8.25/doc/coreutils.texi +@@ -7750,8 +7750,8 @@ this"} in the default C locale. This lo + + You can specify the default value of the @option{--quoting-style} option + with the environment variable @env{QUOTING_STYLE}@. If that environment +-variable is not set, the default value is @samp{shell-escape} when the +-output is a terminal, and @samp{literal} otherwise. ++variable is not set, the default value is @samp{literal}, but this ++default may change to @samp{shell} in a future version of this package. + + @item --show-control-chars + @opindex --show-control-chars +--- coreutils-8.25.orig/src/ls.c ++++ coreutils-8.25/src/ls.c +@@ -1581,7 +1581,6 @@ decode_switches (int argc, char **argv) + if (isatty (STDOUT_FILENO)) + { + format = many_per_line; +- set_quoting_style (NULL, shell_escape_quoting_style); + /* See description of qmark_funny_chars, above. */ + qmark_funny_chars = true; + } diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils_6.9.bb b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils_6.9.bb index 9ce717d1a..35700a32f 100644 --- a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils_6.9.bb +++ b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils_6.9.bb @@ -88,6 +88,10 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs}" +ALTERNATIVE_${PN}-doc = "su.1 hostname.1" +ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" +ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" + ALTERNATIVE_PRIORITY[uptime] = "10" ALTERNATIVE_PRIORITY[hostname] = "10" diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils_8.25.bb b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils_8.25.bb index 419a69337..df6ad380f 100644 --- a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils_8.25.bb +++ b/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils_8.25.bb @@ -19,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz;name=tarball \ file://fix-selinux-flask.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0001-uname-report-processor-and-hardware-correctly.patch \ + file://disable-ls-output-quoting.patch \ " SRC_URI[tarball.md5sum] = "070e43ba7f618d747414ef56ab248a48" @@ -37,7 +38,8 @@ PACKAGECONFIG_class-target ??= "\ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} \ " -PACKAGECONFIG_class-native ??= "" +# The lib/oe/path.py requires xattr +PACKAGECONFIG_class-native ??= "xattr" # with, without, depends, rdepends # @@ -69,6 +71,15 @@ do_compile_prepend () { mkdir -p ${B}/src } +do_install_class-native() { + autotools_do_install + # remove groups to fix conflict with shadow-native + rm -f ${D}${STAGING_BINDIR_NATIVE}/groups + # The return is a must since native doesn't need the + # do_install_append() in the below. + return +} + do_install_append() { for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done @@ -91,16 +102,13 @@ do_install_append() { cp -a ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN} } -do_install_append_class-native(){ - # remove groups to fix conflict with shadow-native - rm -f ${D}${STAGING_BINDIR_NATIVE}/groups -} - inherit update-alternatives ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df" -ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1 groups.1 kill.1 uptime.1 stat.1" +ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1 groups.1 kill.1 uptime.1 stat.1 hostname.1" + +ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" ALTERNATIVE_LINK_NAME[base64] = "${base_bindir}/base64" ALTERNATIVE_TARGET[base64] = "${bindir}/base64.${BPN}" |
