diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-25 12:45:53 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-27 14:38:15 -0400 |
commit | 316dfdd917bec6a218f431211d28bf8df6b6fb0f (patch) | |
tree | 5541073f9851f44c2bd67b4959dc776ee3c3810f /import-layers/yocto-poky/meta/recipes-extended/bash | |
parent | 36acd3e888044dea2ac0b2946f15616f968388c9 (diff) | |
download | talos-openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.tar.gz talos-openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.zip |
Yocto 2.5
Move OpenBMC to Yocto 2.5(sumo)
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: I5c5ad6904a16e14c1c397f0baf10c9d465594a78
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/bash')
5 files changed, 45 insertions, 71 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash.inc b/import-layers/yocto-poky/meta/recipes-extended/bash/bash.inc index f4e1f7a11..9c2b065f9 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/bash/bash.inc +++ b/import-layers/yocto-poky/meta/recipes-extended/bash/bash.inc @@ -6,7 +6,7 @@ DEPENDS = "ncurses bison-native virtual/libiconv" inherit autotools gettext texinfo update-alternatives ptest -EXTRA_AUTORECONF += "--exclude=autoheader" +EXTRA_AUTORECONF += "--exclude=autoheader --exclude=aclocal" EXTRA_OECONF = "--enable-job-control --without-bash-malloc" # If NON_INTERACTIVE_LOGIN_SHELLS is defined, all login shells read the @@ -25,7 +25,7 @@ RDEPENDS_${PN} += "base-files" RDEPENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}-ptest += "make" -DEPENDS_append_libc-glibc = " glibc-locale" +DEPENDS_append_libc-glibc = " virtual/libc-locale" RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-fr-fr locale-base-de-de" USERADD_PACKAGES = "${PN}-ptest" @@ -33,12 +33,6 @@ USERADD_PARAM_${PN}-ptest = "--create-home --user-group test" CACHED_CONFIGUREVARS += "headersdir=${includedir}/${PN}" -do_configure_prepend () { - if [ ! -e ${S}/acinclude.m4 ]; then - cat ${S}/aclocal.m4 > ${S}/acinclude.m4 - fi -} - do_compile_ptest () { oe_runmake buildtest } diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/execute_cmd.patch b/import-layers/yocto-poky/meta/recipes-extended/bash/bash/execute_cmd.patch index 81f8f0a9c..9970b4d8f 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/execute_cmd.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/bash/bash/execute_cmd.patch @@ -1,8 +1,10 @@ Upstream-Status: Inappropriate [embedded specific] ---- execute_cmd.c.orig Fri Jun 3 13:34:42 2011 -+++ execute_cmd.c Fri Jun 3 13:36:41 2011 -@@ -2202,7 +2202,11 @@ +Index: execute_cmd.c +=================================================================== +--- execute_cmd.c.orig ++++ execute_cmd.c +@@ -2459,7 +2459,11 @@ execute_pipeline (command, asynchronous, /* If the `lastpipe' option is set with shopt, and job control is not enabled, execute the last element of non-async pipelines in the current shell environment. */ @@ -13,5 +15,5 @@ Upstream-Status: Inappropriate [embedded specific] +#endif + asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) { - lstdin = move_to_high_fd (0, 0, 255); + lstdin = move_to_high_fd (0, 1, -1); if (lstdin > 0) diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/pathexp-dep.patch b/import-layers/yocto-poky/meta/recipes-extended/bash/bash/pathexp-dep.patch new file mode 100644 index 000000000..e05bbda31 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/bash/bash/pathexp-dep.patch @@ -0,0 +1,13 @@ +pathexp includes libintl.h but doesn't depend on it, thus a build race can occur. + +Upstream-Status: Submitted (https://savannah.gnu.org/patch/index.php?9503) +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/Makefile.in b/Makefile.in +index c7b62bc0..241cbf12 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1281,2 +1281,3 @@ nojobs.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h + y.tab.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h ++pathexp.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h + pcomplete.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.12.bb b/import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.12.bb new file mode 100644 index 000000000..9382a77af --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.12.bb @@ -0,0 +1,24 @@ +require bash.inc + +# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ + file://execute_cmd.patch;striplevel=0 \ + file://mkbuiltins_have_stringize.patch \ + file://build-tests.patch \ + file://test-output.patch \ + file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch \ + file://run-ptest \ + file://fix-run-builtins.patch \ + file://0001-help-fix-printf-format-security-warning.patch \ + file://bash-memleak-bug-fix-for-builtin-command-read.patch \ + file://pathexp-dep.patch \ + " + +SRC_URI[tarball.md5sum] = "7c112970cbdcadfc331e10eeb5f6aa41" +SRC_URI[tarball.sha256sum] = "57d8432be54541531a496fd4904fdc08c12542f43605a9202594fa5d5f9f2331" + + +BBCLASSEXTEND = "nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.bb b/import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.bb deleted file mode 100644 index e544d07c1..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.bb +++ /dev/null @@ -1,59 +0,0 @@ -require bash.inc - -# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-001;apply=yes;striplevel=0;name=patch001 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-002;apply=yes;striplevel=0;name=patch002 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-003;apply=yes;striplevel=0;name=patch003 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-004;apply=yes;striplevel=0;name=patch004 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-005;apply=yes;striplevel=0;name=patch005 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-006;apply=yes;striplevel=0;name=patch006 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-007;apply=yes;striplevel=0;name=patch007 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-008;apply=yes;striplevel=0;name=patch008 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-009;apply=yes;striplevel=0;name=patch009 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-010;apply=yes;striplevel=0;name=patch010 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-011;apply=yes;striplevel=0;name=patch011 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-012;apply=yes;striplevel=0;name=patch012 \ - file://execute_cmd.patch;striplevel=0 \ - file://mkbuiltins_have_stringize.patch \ - file://build-tests.patch \ - file://test-output.patch \ - file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch \ - file://run-ptest \ - file://fix-run-builtins.patch \ - file://0001-help-fix-printf-format-security-warning.patch \ - file://bash-memleak-bug-fix-for-builtin-command-read.patch \ - " - -SRC_URI[tarball.md5sum] = "148888a7c95ac23705559b6f477dfe25" -SRC_URI[tarball.sha256sum] = "d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb" - -SRC_URI[patch001.md5sum] = "817d01a6c0af6f79308a8b7b649e53d8" -SRC_URI[patch001.sha256sum] = "3e28d91531752df9a8cb167ad07cc542abaf944de9353fe8c6a535c9f1f17f0f" -SRC_URI[patch002.md5sum] = "765e14cff12c7284009772e8e24f2fe0" -SRC_URI[patch002.sha256sum] = "7020a0183e17a7233e665b979c78c184ea369cfaf3e8b4b11f5547ecb7c13c53" -SRC_URI[patch003.md5sum] = "49e7da93bf07f510a2eb6bb43ac3e5a2" -SRC_URI[patch003.sha256sum] = "51df5a9192fdefe0ddca4bdf290932f74be03ffd0503a3d112e4199905e718b2" -SRC_URI[patch004.md5sum] = "4557d674ab5831a5fa98052ab19edaf4" -SRC_URI[patch004.sha256sum] = "ad080a30a4ac6c1273373617f29628cc320a35c8cd06913894794293dc52c8b3" -SRC_URI[patch005.md5sum] = "cce96dd77cdd1d293beec10848f6cbb5" -SRC_URI[patch005.sha256sum] = "221e4b725b770ad0bb6924df3f8d04f89eeca4558f6e4c777dfa93e967090529" -SRC_URI[patch006.md5sum] = "d3379f8d8abce5c6ee338f931ad008d5" -SRC_URI[patch006.sha256sum] = "6a8e2e2a6180d0f1ce39dcd651622fb6d2fd05db7c459f64ae42d667f1e344b8" -SRC_URI[patch007.md5sum] = "ec38c76ca439ca7f9c178e9baede84fc" -SRC_URI[patch007.sha256sum] = "de1ccc07b7bfc9e25243ad854f3bbb5d3ebf9155b0477df16aaf00a7b0d5edaf" -SRC_URI[patch008.md5sum] = "e0ba18c1e3b94f905da9b5bf9d38b58b" -SRC_URI[patch008.sha256sum] = "86144700465933636d7b945e89b77df95d3620034725be161ca0ca5a42e239ba" -SRC_URI[patch009.md5sum] = "e952d4f44e612048930c559d90eb99bb" -SRC_URI[patch009.sha256sum] = "0b6bdd1a18a0d20e330cc3bc71e048864e4a13652e29dc0ebf3918bea729343c" -SRC_URI[patch010.md5sum] = "57b5b35955d68f9a09dbef6b86d2c782" -SRC_URI[patch010.sha256sum] = "8465c6f2c56afe559402265b39d9e94368954930f9aa7f3dfa6d36dd66868e06" -SRC_URI[patch011.md5sum] = "cc896e1fa696b93ded568e557e2392d5" -SRC_URI[patch011.sha256sum] = "dd56426ef7d7295e1107c0b3d06c192eb9298f4023c202ca2ba6266c613d170d" -SRC_URI[patch012.md5sum] = "fa47fbfa56fb7e9e5367f19a9df5fc9e" -SRC_URI[patch012.sha256sum] = "fac271d2bf6372c9903e3b353cb9eda044d7fe36b5aab52f21f3f21cd6a2063e" - -BBCLASSEXTEND = "nativesdk" |