uclibc: menuconfig: take into account initial settings from config file
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> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
8f3c642413
commit
c7b312ff41
@ -394,7 +394,6 @@ UCLIBC_MAKE_FLAGS = \
|
||||
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 @@ define UCLIBC_INSTALL_STAGING_CMDS
|
||||
$(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 @@ uclibc-menuconfig: uclibc-patch
|
||||
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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user