diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2017-10-03 17:38:52 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:33:21 +0000 |
commit | 3bbc1577d92d2e56354a34a774e702418c82c2aa (patch) | |
tree | 8297b0b46c3fb5cc67a84cee4d489a36dfc31858 /meta/recipes-core/busybox/busybox.inc | |
parent | 7515e9f0bca31aaaf7460701101baf22808fd46a (diff) | |
download | poky-3bbc1577d92d2e56354a34a774e702418c82c2aa.tar.gz |
busybox: 1.24.1 -> 1.27.2
- fixed link creation to shell
- reported bug with suid shells [https://bugs.busybox.net/show_bug.cgi?id=10346]
- removed and modified already merged patches
- updated defconfig regarding to new version
(From OE-Core rev: 55740077a1f3bed5956fe02ef17ba1d99176ea24)
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Radovan Scasny <radovan.scasny@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox.inc')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 48910ca33a..86f0c60249 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -156,6 +156,12 @@ do_compile() { | |||
156 | cp .config .config.orig | 156 | cp .config .config.orig |
157 | oe_runmake busybox.cfg.suid | 157 | oe_runmake busybox.cfg.suid |
158 | oe_runmake busybox.cfg.nosuid | 158 | oe_runmake busybox.cfg.nosuid |
159 | |||
160 | # workaround for suid bug 10346 | ||
161 | if ! grep -q "CONFIG_SH_IS_NONE" busybox.cfg.nosuid; then | ||
162 | echo "CONFIG_SH_IS_NONE" >> busybox.cfg.suid | ||
163 | fi | ||
164 | |||
159 | for i in `cat busybox.cfg.suid busybox.cfg.nosuid`; do | 165 | for i in `cat busybox.cfg.suid busybox.cfg.nosuid`; do |
160 | echo "# $i is not set" >> .config.disable.apps | 166 | echo "# $i is not set" >> .config.disable.apps |
161 | done | 167 | done |
@@ -165,6 +171,12 @@ do_compile() { | |||
165 | cat busybox.cfg.$s | while read item; do | 171 | cat busybox.cfg.$s | while read item; do |
166 | grep -w "$item" .config.orig | 172 | grep -w "$item" .config.orig |
167 | done > .config.app.$s | 173 | done > .config.app.$s |
174 | |||
175 | # workaround for suid bug 10346 | ||
176 | if [ "$s" == "suid" ] ; then | ||
177 | sed "s/.*CONFIG_SH_IS_NONE.*$/CONFIG_SH_IS_NONE=y/" -i .config.app.suid | ||
178 | fi | ||
179 | |||
168 | merge_config.sh -m .config.nonapps .config.app.$s | 180 | merge_config.sh -m .config.nonapps .config.app.$s |
169 | oe_runmake busybox_unstripped | 181 | oe_runmake busybox_unstripped |
170 | mv busybox_unstripped busybox.$s | 182 | mv busybox_unstripped busybox.$s |
@@ -204,7 +216,7 @@ do_install () { | |||
204 | install -m 0755 ${B}/busybox.nosuid ${D}${base_bindir} | 216 | install -m 0755 ${B}/busybox.nosuid ${D}${base_bindir} |
205 | install -m 0644 ${S}/busybox.links.suid ${D}${sysconfdir} | 217 | install -m 0644 ${S}/busybox.links.suid ${D}${sysconfdir} |
206 | install -m 0644 ${S}/busybox.links.nosuid ${D}${sysconfdir} | 218 | install -m 0644 ${S}/busybox.links.nosuid ${D}${sysconfdir} |
207 | if grep -q "CONFIG_FEATURE_SH_IS_ASH=y" ${B}/.config; then | 219 | if grep -q "CONFIG_SH_IS_ASH=y" ${B}/.config; then |
208 | ln -sf busybox.nosuid ${D}${base_bindir}/sh | 220 | ln -sf busybox.nosuid ${D}${base_bindir}/sh |
209 | fi | 221 | fi |
210 | # Keep a default busybox for people who want to invoke busybox directly. | 222 | # Keep a default busybox for people who want to invoke busybox directly. |
@@ -218,7 +230,7 @@ do_install () { | |||
218 | install -m 0755 ${B}/busybox ${D}${base_bindir} | 230 | install -m 0755 ${B}/busybox ${D}${base_bindir} |
219 | fi | 231 | fi |
220 | install -m 0644 ${S}/busybox.links ${D}${sysconfdir} | 232 | install -m 0644 ${S}/busybox.links ${D}${sysconfdir} |
221 | if grep -q "CONFIG_FEATURE_SH_IS_ASH=y" ${B}/.config; then | 233 | if grep -q "CONFIG_SH_IS_ASH=y" ${B}/.config; then |
222 | ln -sf busybox ${D}${base_bindir}/sh | 234 | ln -sf busybox ${D}${base_bindir}/sh |
223 | fi | 235 | fi |
224 | # We make this symlink here to eliminate the error when upgrading together | 236 | # We make this symlink here to eliminate the error when upgrading together |