diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-23 11:44:29 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-23 22:38:43 +0000 |
| commit | 601abb497531823a73bdec3baf56952086e5b4f4 (patch) | |
| tree | 51efe86d7ffc0789f44d6ccbbc8aabac067b5f0b /meta | |
| parent | 842ad404b36e00c89f615a3f7db4a2d30062effa (diff) | |
| download | openembedded-core-601abb497531823a73bdec3baf56952086e5b4f4.tar.gz openembedded-core-601abb497531823a73bdec3baf56952086e5b4f4.tar.bz2 openembedded-core-601abb497531823a73bdec3baf56952086e5b4f4.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 4 |
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() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then # split the .config into two parts, and make two busybox binaries + if [ -e .config.orig ]; then + # Need to guard again an interrupted do_compile - restore any backup + cp .config.orig .config + fi cp .config .config.orig oe_runmake busybox.cfg.suid oe_runmake busybox.cfg.nosuid |