busybox/uclibc: copy config file from configure step

This patch series changes busybox and uclibc to copy the .config file from the configure step, and not earlier (patch or extract step). This fixes the usage of OVERRIDE_SRCDIR with these packages.

This was reported for busybox in bug #5030.

---
 package/busybox/busybox.mk |  4 +---
 package/uclibc/uclibc.mk   |  3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

The three typical packages that use .config files in buildroot copy the config file at different times in the build process:

busybox copies its .config from the post-extract hook. linux copies its .config in the configure_cmds. uclibc copies its .config from the post-patch hook.

Copying the .config file from the configure step is the only way to properly support an OVERRIDE_SRCDIR that does not yet have the .config file, because the extract and patch steps are skipped in that case.

For example, when setting a BUSYBOX_OVERRIDE_SRCDIR to a cleanly extracted busybox tarball:

$ make busybox-dirclean busybox
rm -Rf [..]/output/build/busybox-custom

rsync -au --exclude .svn --exclude .git --exclude .hg --exclude .bzr

            --exclude CVS /home/tdescham/repo/contrib/busybox-1.21.1/
            [..]/output/build/busybox-custom

/bin/sed -i -e "/\\<CONFIG_NOMMU\\>/d"
[..]/output/build/busybox-custom/.config
/bin/sed: can't read [..]/output/build/busybox-custom/.config:
No such file or directory
make: *** [[..]/output/build/busybox-custom/.stamp_configured] Error 2

This patch modifies busybox.mk to copy the config file from the configure step instead, as linux is doing, and fixing the described scenario.

This fixes bug #5030: https://bugs.busybox.net/show_bug.cgi?id=5030

---
 package/busybox/busybox.mk |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

@@ -180,10 +180,8 @@ define BUSYBOX_INSTALL_WATCHDOG_SCRIPT
 endef
 endif
 
-# We do this here to avoid busting a modified .config in configure
-BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG
-
 define BUSYBOX_CONFIGURE_CMDS
+	$(BUSYBOX_COPY_CONFIG)
 	$(BUSYBOX_SET_MMU)
 	$(BUSYBOX_SET_LARGEFILE)
 	$(BUSYBOX_SET_IPV6)

The three typical packages that use .config files in buildroot copy the config file at different times in the build process:

busybox copies its .config from the post-extract hook. linux copies its .config in the configure_cmds. uclibc copies its .config from the post-patch hook.

Copying the .config file from the configure step is the only way to properly support an OVERRIDE_SRCDIR that does not yet have the .config file, because the extract and patch steps are skipped in that case.

In a previous patch, the situation was already fixed for busybox. This patch applies the same fix to uclibc: copy the config file from the configure step, as linux is doing.

---
 package/uclibc/uclibc.mk |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

@@ -453,9 +453,8 @@ define UCLIBC_SETUP_DOT_CONFIG
 		oldconfig
 endef
 
-UCLIBC_POST_PATCH_HOOKS += UCLIBC_SETUP_DOT_CONFIG
-
 define UCLIBC_CONFIGURE_CMDS
+	$(UCLIBC_SETUP_DOT_CONFIG)
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		$(UCLIBC_MAKE_FLAGS) \
 		PREFIX=$(STAGING_DIR) \

Ping... I think this could still be applied in 2014.02, as it fixes a bug and simply lines up three packages.

Thanks,
Thomas

Committed series, thanks.

Bye, Peter Korsgaard

Thanks Peter!