summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-23 11:44:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-23 22:38:49 +0000
commitbc72e4dac2ffdd951b4e6bcdb790016aa4538d2c (patch)
tree0f73a9bc0e5aac3142113336399f0fe72ba67d4c /meta
parent4aa6644f92975ded908ef99cf313466e0845e071 (diff)
downloadpoky-bc72e4dac2ffdd951b4e6bcdb790016aa4538d2c.tar.gz
busybox: Guard against interrupted compiles
If busybox is interrupted during do_compile, it can corrupt .config with the suid version, or worse. Typically this leads to files disappearing, particularly /etc/init.d/* which leads to an empty busybox-hwclock. That then results in errors at do_rootfs time due to the missing package. The fix is to use any 'orig' present to restore stat at the start of compile. (From OE-Core rev: 601abb497531823a73bdec3baf56952086e5b4f4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/busybox/busybox.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 1f4a48c8cf..34f4e254f1 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -141,6 +141,10 @@ do_compile() {
141 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS 141 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
142 if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then 142 if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then
143 # split the .config into two parts, and make two busybox binaries 143 # split the .config into two parts, and make two busybox binaries
144 if [ -e .config.orig ]; then
145 # Need to guard again an interrupted do_compile - restore any backup
146 cp .config.orig .config
147 fi
144 cp .config .config.orig 148 cp .config .config.orig
145 oe_runmake busybox.cfg.suid 149 oe_runmake busybox.cfg.suid
146 oe_runmake busybox.cfg.nosuid 150 oe_runmake busybox.cfg.nosuid