summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/bash/bash.inc
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-08-18 03:31:51 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 23:46:37 +0100
commit0390b0975e24158755e41060646eb4c4fe367a1e (patch)
tree2f05e26cadc5d267262658a2c60bd2256112efb3 /meta/recipes-extended/bash/bash.inc
parent0bd2dd08e3daf284a6bb7757651af8d40393aec2 (diff)
downloadpoky-0390b0975e24158755e41060646eb4c4fe367a1e.tar.gz
bash: 4.3.30 -> 4.4
1. Rebase patches: - fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch - test-output.patch 2. Drop backported patches: - CVE-2016-9401.patch - fix-run-intl.patch 3. Add ${PN}-loadable for loadable builtins which is new features in Bash 4.4 4. The 4.4 fixed CVE-2017-5932 and CVE-2016-0634 - https://security-tracker.debian.org/tracker/CVE-2017-5932 - https://security-tracker.debian.org/tracker/CVE-2016-0634 5. The 4.4 installed include header files, fix bash-dev confilicts with lib32-bash-dev ..... $ bitbake lib32-core-image-sato-sdk ... |Error: Transaction check error: file /usr/include/bash/config.h conflicts between attempted installs |of lib32-bash-dev-4.4-r0.x86 and bash-dev-4.4-r0.core2_64 ...... (From OE-Core rev: 4097694b13cd5f0d68987551c3f9af80c87dc6ae) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/bash/bash.inc')
-rw-r--r--meta/recipes-extended/bash/bash.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 6c94a24b69..92916d9a6a 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -28,6 +28,8 @@ RDEPENDS_${PN}-ptest += "make"
28USERADD_PACKAGES = "${PN}-ptest" 28USERADD_PACKAGES = "${PN}-ptest"
29USERADD_PARAM_${PN}-ptest = "--create-home --user-group test" 29USERADD_PARAM_${PN}-ptest = "--create-home --user-group test"
30 30
31CACHED_CONFIGUREVARS += "headersdir=${includedir}/${PN}"
32
31do_configure_prepend () { 33do_configure_prepend () {
32 if [ ! -e ${S}/acinclude.m4 ]; then 34 if [ ! -e ${S}/acinclude.m4 ]; then
33 cat ${S}/aclocal.m4 > ${S}/acinclude.m4 35 cat ${S}/aclocal.m4 > ${S}/acinclude.m4
@@ -70,4 +72,8 @@ PACKAGES += "${PN}-bashbug"
70FILES_${PN} = "${bindir}/bash ${base_bindir}/bash.bash" 72FILES_${PN} = "${bindir}/bash ${base_bindir}/bash.bash"
71FILES_${PN}-bashbug = "${bindir}/bashbug" 73FILES_${PN}-bashbug = "${bindir}/bashbug"
72 74
75PACKAGE_BEFORE_PN += "${PN}-loadable"
76RDEPENDS_${PN}-loadable += "${PN}"
77FILES_${PN}-loadable += "${libdir}/bash/*"
78
73RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}" 79RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}"