* [Buildroot] [PATCH 1 of 2] busybox: copy config file from configure iso extract step
2014-02-13 11:34 [Buildroot] [PATCH 0 of 2] busybox/uclibc: copy config file from configure step Thomas De Schampheleire
@ 2014-02-13 11:34 ` Thomas De Schampheleire
2014-02-13 11:34 ` [Buildroot] [PATCH 2 of 2] uclibc: copy config file from configure iso patch step Thomas De Schampheleire
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Thomas De Schampheleire @ 2014-02-13 11:34 UTC (permalink / raw)
To: buildroot
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
>>> busybox custom Syncing from source dir
>>> /home/tdescham/repo/contrib/busybox-1.21.1
rsync -au --exclude .svn --exclude .git --exclude .hg --exclude .bzr
--exclude CVS /home/tdescham/repo/contrib/busybox-1.21.1/
[..]/output/build/busybox-custom
>>> busybox custom Configuring
/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
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
package/busybox/busybox.mk | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -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)
^ permalink raw reply [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2 of 2] uclibc: copy config file from configure iso patch step
2014-02-13 11:34 [Buildroot] [PATCH 0 of 2] busybox/uclibc: copy config file from configure step Thomas De Schampheleire
2014-02-13 11:34 ` [Buildroot] [PATCH 1 of 2] busybox: copy config file from configure iso extract step Thomas De Schampheleire
@ 2014-02-13 11:34 ` Thomas De Schampheleire
2014-02-14 20:32 ` [Buildroot] [PATCH 0 of 2] busybox/uclibc: copy config file from configure step Thomas De Schampheleire
2014-02-14 20:37 ` Peter Korsgaard
3 siblings, 0 replies; 6+ messages in thread
From: Thomas De Schampheleire @ 2014-02-13 11:34 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
package/uclibc/uclibc.mk | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -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) \
^ permalink raw reply [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 0 of 2] busybox/uclibc: copy config file from configure step
2014-02-13 11:34 [Buildroot] [PATCH 0 of 2] busybox/uclibc: copy config file from configure step Thomas De Schampheleire
2014-02-13 11:34 ` [Buildroot] [PATCH 1 of 2] busybox: copy config file from configure iso extract step Thomas De Schampheleire
2014-02-13 11:34 ` [Buildroot] [PATCH 2 of 2] uclibc: copy config file from configure iso patch step Thomas De Schampheleire
@ 2014-02-14 20:32 ` Thomas De Schampheleire
2014-02-14 20:37 ` Peter Korsgaard
3 siblings, 0 replies; 6+ messages in thread
From: Thomas De Schampheleire @ 2014-02-14 20:32 UTC (permalink / raw)
To: buildroot
On Thu, Feb 13, 2014 at 12:34 PM, Thomas De Schampheleire
<patrickdepinguin@gmail.com> wrote:
>
> 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.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> ---
> package/busybox/busybox.mk | 4 +---
> package/uclibc/uclibc.mk | 3 +--
> 2 files changed, 2 insertions(+), 5 deletions(-)
Ping... I think this could still be applied in 2014.02, as it fixes a
bug and simply lines up three packages.
Thanks,
Thomas
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 0 of 2] busybox/uclibc: copy config file from configure step
2014-02-13 11:34 [Buildroot] [PATCH 0 of 2] busybox/uclibc: copy config file from configure step Thomas De Schampheleire
` (2 preceding siblings ...)
2014-02-14 20:32 ` [Buildroot] [PATCH 0 of 2] busybox/uclibc: copy config file from configure step Thomas De Schampheleire
@ 2014-02-14 20:37 ` Peter Korsgaard
2014-02-14 20:40 ` Thomas De Schampheleire
3 siblings, 1 reply; 6+ messages in thread
From: Peter Korsgaard @ 2014-02-14 20:37 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:
> 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.
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Committed series, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 0 of 2] busybox/uclibc: copy config file from configure step
2014-02-14 20:37 ` Peter Korsgaard
@ 2014-02-14 20:40 ` Thomas De Schampheleire
0 siblings, 0 replies; 6+ messages in thread
From: Thomas De Schampheleire @ 2014-02-14 20:40 UTC (permalink / raw)
To: buildroot
On Fri, Feb 14, 2014 at 9:37 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:
>
> > 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.
>
> > Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> Committed series, thanks.
Thanks Peter!
^ permalink raw reply [flat|nested] 6+ messages in thread