summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonin Godard <antoningodard@pm.me>2023-01-09 09:05:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-26 23:37:05 +0000
commitf26e5d7500608c64623619d83b9d52bd76bf8231 (patch)
tree96c64d4211c426cf0cdfd11f01814a7650d51c9b
parent692ea97f201acb738df0379e35e7ac35a377fb67 (diff)
downloadpoky-f26e5d7500608c64623619d83b9d52bd76bf8231.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. (From OE-Core rev: a1cd0c804b974ae100cfe8cb34ddd400e3c8206b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 74cd440c4e3df0ed3b81cf5c60a3f92e0dd3fe6c) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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() {
154 cp include/autoconf.h.orig include/autoconf.h 154 cp include/autoconf.h.orig include/autoconf.h
155 155
156 if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then 156 if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then
157 # Guard againt interrupted do_compile: clean temporary files.
158 rm -f .config.app.suid .config.app.nosuid .config.disable.apps .config.nonapps
159
157 # split the .config into two parts, and make two busybox binaries 160 # split the .config into two parts, and make two busybox binaries
158 oe_runmake busybox.cfg.suid 161 oe_runmake busybox.cfg.suid
159 oe_runmake busybox.cfg.nosuid 162 oe_runmake busybox.cfg.nosuid