diff options
Diffstat (limited to 'meta/recipes-core/coreutils')
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils-8.23/fix-selinux-flask.patch (renamed from meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils-8.23/remove-usr-local-lib-from-m4.patch (renamed from meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils_6.9.bb | 14 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.23.bb (renamed from meta/recipes-core/coreutils/coreutils_8.22.bb) | 29 |
7 files changed, 55 insertions, 68 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch b/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch deleted file mode 100644 index 4757f52aa0..0000000000 --- a/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -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.22/fix-for-dummy-man-usage.patch b/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch deleted file mode 100644 index b7e82609bd..0000000000 --- a/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Pending - -coreutils: fix for dummy-man usage - -The options should be before the final argument, otherwise, the following error -would appear when compiling. - -"dummy-man: too many non-option arguments" - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - man/local.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/man/local.mk b/man/local.mk -index 7cef5e3..dc0865f 100644 ---- a/man/local.mk -+++ b/man/local.mk -@@ -189,8 +189,8 @@ man/yes.1: src/yes - && $(run_help2man) \ - --source='$(PACKAGE_STRING)' \ - --include=$(srcdir)/man/$$name.x \ -- --output=$$t/$$name.1 $$t/$$name \ - --info-page='coreutils \(aq'$$name' invocation\(aq' \ -+ --output=$$t/$$name.1 $$t/$$name \ - && sed \ - -e 's|$*\.td/||g' \ - -e '/For complete documentation/d' \ --- -1.7.9.5 - diff --git a/meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils-8.23/fix-selinux-flask.patch index 9d1ae55d47..9d1ae55d47 100644 --- a/meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch +++ b/meta/recipes-core/coreutils/coreutils-8.23/fix-selinux-flask.patch diff --git a/meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch b/meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch new file mode 100644 index 0000000000..3c896a11bf --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch @@ -0,0 +1,27 @@ +From b4d258629f090066783c3b4c91b40f63b9d0a296 Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker <paul.gortmaker@windriver.com> +Date: Sun, 8 Feb 2015 16:51:57 -0500 +Subject: [PATCH] man: decouple manpages from build + +The use of "help2man" doesn't work at all for cross compile, in +addition to the extra requirement of perl it adds. + +Just decouple the manpages from the build in order to pave the way for +importing prebuilt manpages that can be used in a cross build situation. + +Upstream-Status: Inappropriate [upstream doesn't care about x-compile case.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> + +diff --git a/Makefile.am b/Makefile.am +index fb4af27..7576b2c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -214,5 +214,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src + include $(top_srcdir)/lib/local.mk + include $(top_srcdir)/src/local.mk + include $(top_srcdir)/doc/local.mk +-include $(top_srcdir)/man/local.mk + include $(top_srcdir)/tests/local.mk +-- +2.2.2 + diff --git a/meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.23/remove-usr-local-lib-from-m4.patch index 2ef8a548ac..2ef8a548ac 100644 --- a/meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch +++ b/meta/recipes-core/coreutils/coreutils-8.23/remove-usr-local-lib-from-m4.patch diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb index debd2a123b..9189426315 100644 --- a/meta/recipes-core/coreutils/coreutils_6.9.bb +++ b/meta/recipes-core/coreutils/coreutils_6.9.bb @@ -9,11 +9,10 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://src/ls.c;beginline=4;endline=16;md5=15ed60f67b1db5fedd5dbc37cf8a9543" PR = "r5" -DEPENDS_class-native = "gettext-native" inherit autotools gettext texinfo -SRC_URI_BASE = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \ file://gnulib_m4.patch \ file://futimens.patch \ file://coreutils-ls-x.patch \ @@ -25,23 +24,20 @@ SRC_URI_BASE = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \ file://coreutils_fix_for_automake-1.12.patch \ file://coreutils-build-with-acl.patch \ file://coreutils-fix-texinfo.patch \ + file://fix_for_manpage_building.patch \ " -SRC_URI = "${SRC_URI_BASE} file://fix_for_manpage_building.patch" -SRC_URI_class-native = "${SRC_URI_BASE}" - SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06" SRC_URI[sha256sum] = "89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0" # acl is not a default feature # -PACKAGECONFIG_class-target ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" -PACKAGECONFIG_class-native ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" # with, without, depends, rdepends # -PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," +PACKAGECONFIG[acl] = "ac_cv_header_sys_acl_h=yes,ac_cv_header_sys_acl_h=no,acl," # [ gets a special treatment and is not included in this @@ -102,5 +98,3 @@ python __anonymous() { 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.22.bb b/meta/recipes-core/coreutils/coreutils_8.23.bb index 6239600c6d..63df75e7ba 100644 --- a/meta/recipes-core/coreutils/coreutils_8.22.bb +++ b/meta/recipes-core/coreutils/coreutils_8.23.bb @@ -12,15 +12,17 @@ DEPENDS_class-native = "" inherit autotools gettext texinfo -SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ +SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz;name=tarball \ + http://distfiles.gentoo.org/distfiles/${BP}-man.tar.xz;name=manpages \ + file://man-decouple-manpages-from-build.patch \ file://remove-usr-local-lib-from-m4.patch \ - file://dummy_help2man.patch \ - file://fix-for-dummy-man-usage.patch \ file://fix-selinux-flask.patch \ " -SRC_URI[md5sum] = "8fb0ae2267aa6e728958adc38f8163a2" -SRC_URI[sha256sum] = "5b3e94998152c017e6c75d56b9b994188eb71bf46d4038a642cb9141f6ff1212" +SRC_URI[tarball.md5sum] = "abed135279f87ad6762ce57ff6d89c41" +SRC_URI[tarball.sha256sum] = "ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d" +SRC_URI[manpages.md5sum] = "ce49bc8360e16afe67581d136606efc7" +SRC_URI[manpages.sha256sum] = "d1b16e74b3dba4f313aeebae2c69da205f7d2e6e1c2aa8d39026c860d314ecca" EXTRA_OECONF_class-native = "--without-gmp" EXTRA_OECONF_class-target = "--enable-install-program=arch --libexecdir=${libdir}" @@ -72,24 +74,41 @@ do_install_append() { # in update-alternatives to fail, therefore use lbracket - the name used # for the actual source file. mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN} + + # prebuilt man pages + install -d ${D}/${mandir}/man1 + install -t ${D}/${mandir}/man1 ${S}/man/*.1 + # prebuilt man pages don't do a separate man page for [ vs test. + # see comment above r.e. sed and update-alternatives + 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" ALTERNATIVE_LINK_NAME[base64] = "${base_bindir}/base64" ALTERNATIVE_TARGET[base64] = "${bindir}/base64.${BPN}" +ALTERNATIVE_LINK_NAME[base64.1] = "${mandir}/man1/base64.1" ALTERNATIVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp" ALTERNATIVE_TARGET[mktemp] = "${bindir}/mktemp.${BPN}" +ALTERNATIVE_LINK_NAME[mktemp.1] = "${mandir}/man1/mktemp.1" ALTERNATIVE_LINK_NAME[df] = "${base_bindir}/df" ALTERNATIVE_TARGET[df] = "${bindir}/df.${BPN}" +ALTERNATIVE_LINK_NAME[df.1] = "${mandir}/man1/df.1" ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/[" ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}" +ALTERNATIVE_LINK_NAME[lbracket.1] = "${mandir}/man1/lbracket.1" python __anonymous() { for prog in d.getVar('base_bindir_progs', True).split(): |