busybox: rm temporary files if do_compile was interrupted

To avoid working with undeterministic config files, remove all the
temporary files to start from scratch.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 74cd440c4e3df0ed3b81cf5c60a3f92e0dd3fe6c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index dff4a5dec9979638fea91a81ec56f4f527901e06..62dc839245dc27916115c14bf1502b99fc520c97 100644 (file)
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -154,6 +154,9 @@ do_compile() {
        cp include/autoconf.h.orig include/autoconf.h
 
        if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then
+               # Guard againt interrupted do_compile: clean temporary files.
+               rm -f .config.app.suid .config.app.nosuid .config.disable.apps .config.nonapps
+
                # split the .config into two parts, and make two busybox binaries
                oe_runmake busybox.cfg.suid
                oe_runmake busybox.cfg.nosuid