diff options
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2020-04-04 14:10:14 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-08-30 08:53:37 +0200
commit9841cc9432ed2c2852b057a65ad245b6f42aceaa (patch)
parent61ba2ec6858b291c64df253f072e13bdfa16c948 (diff)
package/pkg-utils.mk: kconfig mangling defaults to current package's .config
The kconfig mangling macros currently operate on the caller-supplied .config file, on the assumption that the caller will always know what file to mangle. This was correct so far, as packages would indeed only mangle their own .config files. However, the Linux kernel does its mangling based on whether some other packages are enabled or not. That list of conditional mangling is getting bigger and bigger with each new package that needs such mangling, culminating with the pending firewalld one [0]. Furthermore, this mangling is not accessible to packages in br2-external trees. So we'll want to have packages provide the mangling commands. So we'll want the mangling to be done on the Linux' .config file in the expanding package context, not in the package calling the macros. But packages do not, and should not have knowledge about where the .config file is, nor how it is named. So we make the parameter to specify the .config file to mangle optional. If it is set, this is what the macros will mangle; if it is not set, the expanding package's .config file will be used. This has the added benefit that we do not have to repeat in the expanding package context the knowledge of how the .config file is named: FOO_KCONFIG_DOTCONFIG = .config define FOO_KCONFIG_FIXUPS_CMDS $(call KCONFIG_ENABLE_OPT,BLA) endef [0] http://lists.busybox.net/pipermail/buildroot/2020-March/278683.html Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit 21e69972bf36836f17f105700aa7791c76f2f48c) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2 files changed, 17 insertions, 6 deletions
diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
index 9aea101b45..45faf50e71 100644
--- a/package/pkg-kconfig.mk
+++ b/package/pkg-kconfig.mk
@@ -167,6 +167,7 @@ define $(2)_FIXUP_DOT_CONFIG
$$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done
+$$($(2)_DIR)/.stamp_kconfig_fixup_done: PKG=$(2)
$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG)
@@ -224,6 +225,7 @@ $(2)_CONFIGURATOR_MAKE_ENV = \
# end up having a valid @D.
$$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $(1)-%: $$($(2)_DIR)/.kconfig_editor_%
+$$($(2)_DIR)/.kconfig_editor_%: PKG=$(2)
$$($(2)_DIR)/.kconfig_editor_%: $$($(2)_DIR)/.stamp_kconfig_fixup_done
$$($(2)_CONFIGURATOR_MAKE_ENV) $$($(2)_MAKE) -C $$($(2)_DIR) \
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 91a492588e..c4cafeeeeb 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -11,17 +11,26 @@
# package, and more.
-# KCONFIG_MUNGE_DOT_CONFIG (option, newline, file)
+# Returns the path to the .config file that should be used, which will
+# be $(1) if provided, or the current package .config file otherwise.
+ $(if $(strip $(1)), $(1), \
+ ) \
+# KCONFIG_MUNGE_DOT_CONFIG (option, newline [, file])
- $(SED) "/\\<$(strip $(1))\\>/d" $(strip $(3))
- echo '$(strip $(2))' >> $(strip $(3))
+ $(SED) "/\\<$(strip $(1))\\>/d" $(call KCONFIG_DOT_CONFIG,$(3))
+ echo '$(strip $(2))' >> $(call KCONFIG_DOT_CONFIG,$(3))
-# KCONFIG_ENABLE_OPT (option, file)
+# KCONFIG_ENABLE_OPT (option [, file])
-# KCONFIG_SET_OPT (option, value, file)
+# KCONFIG_SET_OPT (option, value [, file])
KCONFIG_SET_OPT = $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(1)=$(2), $(3))
-# KCONFIG_DISABLE_OPT (option, file)
+# KCONFIG_DISABLE_OPT (option [, file])
KCONFIG_DISABLE_OPT = $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(SHARP_SIGN) $(1) is not set, $(2))
# Helper functions to determine the name of a package and its