diff mbox series

busybox: rm faulty .config arg to merge_config.sh

Message ID 20250522225348.2412108-1-joakim.tjernlund@infinera.com
State New
Headers show
Series busybox: rm faulty .config arg to merge_config.sh | expand

Commit Message

Joakim Tjernlund May 22, 2025, 10:53 p.m. UTC
.config is implicit and also an output file, its precence confuses
merge_config.sh to not apply .cfg fragments.

Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
---
 meta/recipes-core/busybox/busybox.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mathieu Dubois-Briand May 23, 2025, 3:11 p.m. UTC | #1
On Fri May 23, 2025 at 12:53 AM CEST, Joakim Tjernlund via lists.openembedded.org wrote:
> .config is implicit and also an output file, its precence confuses
> merge_config.sh to not apply .cfg fragments.
>
> Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
> ---

Hi Joakim,

Thanks for your patch.

It looks like this is breaking the build on the autobuilder, maybe only
with poky-altcfg distro.

Here is the error:

ERROR: core-image-full-cmdline-1.0-r0 do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot,
then please place them into pkg_postinst_ontarget:${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.

https://autobuilder.yoctoproject.org/valkyrie/#/builders/9/builds/1665
https://autobuilder.yoctoproject.org/valkyrie/#/builders/10/builds/1685
https://autobuilder.yoctoproject.org/valkyrie/#/builders/22/builds/1690
https://autobuilder.yoctoproject.org/valkyrie/#/builders/74/builds/1670

Can you have a look at this error please?
diff mbox series

Patch

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index f5d7c3f9c8..938f09925c 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -137,7 +137,7 @@  do_prepare_config () {
 do_configure () {
 	set -x
 	do_prepare_config
-	merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
+	merge_config.sh -m ${@" ".join(find_cfgs(d))}
 	cml1_do_configure
 
 	# Save a copy of .config and autoconf.h.