diff options
| author | Antonin Godard <antoningodard@pm.me> | 2023-01-09 09:05:24 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-26 23:39:06 +0000 |
| commit | cd1acece79d1219a9d7850ac0d82a904e5e41541 (patch) | |
| tree | bcf4b509eb1b4cc44b9958faa04e85194e977d51 /meta | |
| parent | 630974ec95912de1870d272d2a8f4fe492ae5fb4 (diff) | |
| download | poky-cd1acece79d1219a9d7850ac0d82a904e5e41541.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: 30cf3640bf18c8ec48d69c566938b38d8561d368)
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 3 |
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 |
