diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2017-08-18 03:31:51 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-18 12:35:56 +0100 |
| commit | 4097694b13cd5f0d68987551c3f9af80c87dc6ae (patch) | |
| tree | 856ea39cd724333d9fbbdfe76d73165edcd85877 /meta/recipes-extended/bash/bash.inc | |
| parent | f5c7e236582028638a26a5855d5e7ba0b55bb8f0 (diff) | |
| download | openembedded-core-4097694b13cd5f0d68987551c3f9af80c87dc6ae.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
......
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.inc | 6 |
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" USERADD_PACKAGES = "${PN}-ptest" 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 @@ -70,4 +72,8 @@ PACKAGES += "${PN}-bashbug" FILES_${PN} = "${bindir}/bash ${base_bindir}/bash.bash" FILES_${PN}-bashbug = "${bindir}/bashbug" +PACKAGE_BEFORE_PN += "${PN}-loadable" +RDEPENDS_${PN}-loadable += "${PN}" +FILES_${PN}-loadable += "${libdir}/bash/*" + RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}" |