From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2 of 3 v2] uclibc: menuconfig: take into account initial settings from config file
Date: Tue, 15 Jul 2014 20:43:36 +0200 [thread overview]
Message-ID: <a22b18c9a90d46d71165.1405449816@localhost> (raw)
In-Reply-To: <patchbomb.1405449814@localhost>
When executing the sequence 'make clean uclibc-menuconfig', the configured
config file is not taken into account and one starts from the default
settings.
This patch adds an explicit target for the config file and lets the
configure and menuconfig steps depend on it, fixing the problem.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2:
- use UCLIBC_TARGET_CONFIGURE instead of specifying the stamp path in full
(Arnout)
rfc->patch:
- add target for .config to avoid menuconfig copying the config file
every time (ThomasP, Arnout)
- move dependency on patch step from menuconfig to the .config target
package/uclibc/uclibc.mk | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff -r 9634175cf29d -r a22b18c9a90d package/uclibc/uclibc.mk
--- a/package/uclibc/uclibc.mk Wed Jul 02 21:31:07 2014 +0200
+++ b/package/uclibc/uclibc.mk Sun Jun 22 10:37:22 2014 +0200
@@ -394,7 +394,6 @@
HOSTCC="$(HOSTCC)"
define UCLIBC_FIXUP_DOT_CONFIG
- $(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config
$(call KCONFIG_SET_OPT,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)",$(@D)/.config)
$(call KCONFIG_ENABLE_OPT,TARGET_$(UCLIBC_TARGET_ARCH),$(@D)/.config)
$(call KCONFIG_SET_OPT,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)",$(@D)/.config)
@@ -533,7 +532,14 @@
$(UCLIBC_INSTALL_UTILS_STAGING)
endef
-uclibc-menuconfig: uclibc-patch
+$(eval $(generic-package))
+
+$(UCLIBC_DIR)/.config: $(UCLIBC_CONFIG_FILE) | uclibc-patch
+ $(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config
+
+$(UCLIBC_TARGET_CONFIGURE): $(UCLIBC_DIR)/.config
+
+uclibc-menuconfig: $(UCLIBC_DIR)/.config
$(MAKE1) -C $(UCLIBC_DIR) \
$(UCLIBC_MAKE_FLAGS) \
PREFIX=$(STAGING_DIR) \
@@ -542,8 +548,6 @@
menuconfig
rm -f $(UCLIBC_DIR)/.stamp_{configured,built,target_installed,staging_installed}
-$(eval $(generic-package))
-
uclibc-update-config: $(UCLIBC_DIR)/.stamp_configured
cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
next prev parent reply other threads:[~2014-07-15 18:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-15 18:43 [Buildroot] [PATCH 0 of 3 v2] uclibc: fix handling of configuration file Thomas De Schampheleire
2014-07-15 18:43 ` [Buildroot] [PATCH 1 of 3 v2] uclibc: rename SETUP_DOT_CONFIG to FIXUP_DOT_CONFIG Thomas De Schampheleire
2014-07-17 23:23 ` Arnout Vandecappelle
2014-07-15 18:43 ` Thomas De Schampheleire [this message]
2014-07-15 18:43 ` [Buildroot] [PATCH 3 of 3 v2] uclibc: update-config: preserve freshly configured settings Thomas De Schampheleire
2014-07-17 17:57 ` [Buildroot] [PATCH 0 of 3 v2] uclibc: fix handling of configuration file Thomas De Schampheleire
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a22b18c9a90d46d71165.1405449816@localhost \
--to=patrickdepinguin@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox