aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Romain Izard <romain.izard.pro@gmail.com>2016-04-23 19:46:04 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-04-24 23:52:23 +0200
commit638ea2d715950f1409475e01a37f25c3528df35e (patch)
tree41f79f807fbfb699b75214c4f9c528b4934dab63 /package
parent6046c1c93a5c0d67ac7260cee671e75aa7a200cd (diff)
downloadbuildroot-638ea2d715950f1409475e01a37f25c3528df35e.tar.gz
buildroot-638ea2d715950f1409475e01a37f25c3528df35e.tar.bz2
core/pkg-kconfig: use olddefconfig when available
Using 'yes "" | make oldconfig' to regenerate a .config file from an existing defconfig does not work reliably in all cases. Specifically, it does not work well with tristate choice entries. The correct way to do it is to use 'make olddefconfig', but this target is not supported in projects that use an old version of kconfig. As most projects do not use tristate entries, there is no need for them to upgrade. 'oldnoconfig' is an alias for 'olddefconfig', but it also is the only name for this target between Linux versions 2.6.36 and 3.6. Check which targets are supported by the current project, and use the appropriate method to regenerate the .config file. Signed-off-by: Romain Izard <romain.izard.pro@gmail.com> [yann.morin.1998@free.fr: use a shell construct instead of makefile code] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Arnout Vandecappelle <arnout@mind.be> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> [Thomas: fix minor typos.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package')
-rw-r--r--package/pkg-kconfig.mk32
1 files changed, 28 insertions, 4 deletions
diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
index 40339150c4..500f730603 100644
--- a/package/pkg-kconfig.mk
+++ b/package/pkg-kconfig.mk
@@ -11,6 +11,15 @@
#
################################################################################
+# Helper to extract the make rule specified in $(2) from all the make rules
+# of the package specified in $(1).
+# Returns a non-empty string (the rule itself) if the rule exists; returns
+# an empty string if the rule does not exist.
+define KCONFIG_RULES
+ $($(1)_KCONFIG_MAKE) -pn config 2>/dev/null | \
+ sed -r -e '/^$(2):/!d'
+endef
+
################################################################################
# inner-kconfig-package -- generates the make targets needed to support a
# kconfig package
@@ -60,18 +69,33 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch
$(2)_KCONFIG_MAKE = \
$$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) $$($(2)_KCONFIG_OPTS)
+# The correct way to regenerate a .config file is to use 'make olddefconfig'.
+# For historical reasons, the target name was '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
+ $$(Q)if [ "`$$(call KCONFIG_RULES,$(2),olddefconfig)`" ]; then \
+ $$($(2)_KCONFIG_MAKE) olddefconfig || exit 1; \
+ elif [ "`$$(call KCONFIG_RULES,$(2),oldnoconfig)`" ]; then \
+ $$($(2)_KCONFIG_MAKE) oldnoconfig || exit 1; \
+ else \
+ (yes "" | $$($(2)_KCONFIG_MAKE) oldconfig) || exit 1; \
+ fi
+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
-# full .config first. We use 'make oldconfig' because this can be safely
-# done even when the package does not support defconfigs.
+# full .config first.
$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
$$(Q)$$(if $$($(2)_KCONFIG_DEFCONFIG), \
$$($(2)_KCONFIG_MAKE) $$($(2)_KCONFIG_DEFCONFIG), \
cp $$($(2)_KCONFIG_FILE) $$(@))
$$(Q)support/kconfig/merge_config.sh -m -O $$(@D) \
$$(@) $$($(2)_KCONFIG_FRAGMENT_FILES)
- $$(Q)yes "" | $$($(2)_KCONFIG_MAKE) oldconfig
+ $$($(2)_REGEN_DOT_CONFIG)
# 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
@@ -82,7 +106,7 @@ $$($(2)_DIR)/.config: | $(1)-patch
# The exact rules are specified by the package .mk file.
define $(2)_FIXUP_DOT_CONFIG
$$($(2)_KCONFIG_FIXUP_CMDS)
- $$(Q)yes "" | $$($(2)_KCONFIG_MAKE) oldconfig
+ $$($(2)_REGEN_DOT_CONFIG)
$$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done
endef