summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonin Godard <antoningodard@pm.me>2023-01-09 09:05:24 +0000
committerSteve Sakoman <steve@sakoman.com>2023-01-19 12:21:34 -1000
commita1cd0c804b974ae100cfe8cb34ddd400e3c8206b (patch)
treea84bf3ffdd6ef6129fb616fb3498a8d0a4a2ed77
parent7e94d0563fadb858aca60d1b1cc3a23e995a500d (diff)
downloadopenembedded-core-contrib-a1cd0c804b974ae100cfe8cb34ddd400e3c8206b.tar.gz
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>
-rw-r--r--meta/recipes-core/busybox/busybox.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index dff4a5dec9..62dc839245 100644
--- 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