@@ -27,6 +27,27 @@ define kconfig-package-update-config
$(Q)touch --reference $($(PKG)_DIR)/$($(PKG)_KCONFIG_DOTCONFIG) $($(PKG)_KCONFIG_FILE)
endef
+# Macro to save the defconfig file
+define kconfig-package-savedefconfig
+ $($(PKG)_MAKE_ENV) $(MAKE) -C $($(PKG)_DIR) \
+ $($(PKG)_KCONFIG_OPTS) savedefconfig
+endef
+
+# The correct way to regenerate a .config file is to use 'make olddefconfig'.
+# For historical reasons, the target name is 'oldnoconfig' between Linux kernel
+# versions 2.6.36 and 3.6, and remains as an alias in later versions.
+# In older versions, and in some other projects that use kconfig, the target is
+# not supported at all, and we use 'yes "" | make oldconfig' as a fallback
+# only, as this can fail in complex cases.
+# $(1): the name of the package in upper-case letters
+define kconfig-package-regen-dot-config
+ $(if $(filter olddefconfig,$($(1)_KCONFIG_RULES)),
+ $(Q)$($(1)_KCONFIG_MAKE) olddefconfig,
+ $(if $(filter oldnoconfig,$($(1)_KCONFIG_RULES)),
+ $(Q)$($(1)_KCONFIG_MAKE) oldnoconfig,
+ $(Q)(yes "" | $($(1)_KCONFIG_MAKE) oldconfig)))
+endef
+
################################################################################
# inner-kconfig-package -- generates the make targets needed to support a
# kconfig package
@@ -90,20 +111,6 @@ $(2)_KCONFIG_RULES = \
$$(shell $$($(2)_KCONFIG_MAKE) -pn config 2>/dev/null | \
sed 's/^\([_0-9a-zA-Z]*config\):.*/\1/ p; d')
-# The correct way to regenerate a .config file is to use 'make olddefconfig'.
-# For historical reasons, the target name is 'oldnoconfig' between Linux kernel
-# versions 2.6.36 and 3.6, and remains as an alias in later versions.
-# In older versions, and in some other projects that use kconfig, the target is
-# not supported at all, and we use 'yes "" | make oldconfig' as a fallback
-# only, as this can fail in complex cases.
-define $(2)_REGEN_DOT_CONFIG
- $$(if $$(filter olddefconfig,$$($(2)_KCONFIG_RULES)),
- $$(Q)$$($(2)_KCONFIG_MAKE) olddefconfig,
- $$(if $$(filter oldnoconfig,$$($(2)_KCONFIG_RULES)),
- $$(Q)$$($(2)_KCONFIG_MAKE) oldnoconfig,
- $$(Q)(yes "" | $$($(2)_KCONFIG_MAKE) oldconfig)))
-endef
-
# The specified source configuration file and any additional configuration file
# fragments are merged together to .config, after the package has been patched.
# Since the file could be a defconfig file it needs to be expanded to a
@@ -114,7 +121,7 @@ $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG): $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_F
$$(INSTALL) -m 0644 -D $$($(2)_KCONFIG_FILE) $$(@))
$$(Q)support/kconfig/merge_config.sh -m -O $$(@D) \
$$(@) $$($(2)_KCONFIG_FRAGMENT_FILES)
- $$($(2)_REGEN_DOT_CONFIG)
+ $$(call kconfig-package-regen-dot-config,$(2))
# If _KCONFIG_FILE or _KCONFIG_FRAGMENT_FILES exists, this dependency is
# already implied, but if we only have a _KCONFIG_DEFCONFIG we have to add
@@ -125,7 +132,7 @@ $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG): | $(1)-patch
# The exact rules are specified by the package .mk file.
define $(2)_FIXUP_DOT_CONFIG
$$($(2)_KCONFIG_FIXUP_CMDS)
- $$($(2)_REGEN_DOT_CONFIG)
+ $$(call kconfig-package-regen-dot-config,$(2))
$$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done
endef
@@ -213,9 +220,9 @@ $(1)-check-configuration-done:
exit 1; \
fi
+$(1)-savedefconfig: PKG=$(2)
$(1)-savedefconfig: $(1)-check-configuration-done
- $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
- $$($(2)_KCONFIG_OPTS) savedefconfig
+ $$(call kconfig-package-savedefconfig)
# Target to copy back the configuration to the source configuration file
# Even though we could use 'cp --preserve-timestamps' here, the separate
This patch refactors savedefconfig and the configuration re-generation to separate macros so that the functionality can be re-used in further targets. Signed-off-by: Marcel Patzlaff <m.patzlaff@pilz.de> --- package/pkg-kconfig.mk | 43 ++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-)