From 23fd6e0e6ac5520391fb2e8f6c1e92eca91d865e Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 3 Feb 2015 15:21:41 +0100 Subject: [PATCH] kconfig infra: support built-in config files When the configuration file of a package is located inside of the package sources, a make dependency can only be expressed after the package has been extracted (and patched). Signed-off-by: Thomas De Schampheleire Signed-off-by: "Yann E. Morin" Signed-off-by: Thomas Petazzoni --- package/pkg-kconfig.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index ec58d69f55..ef724e595f 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -41,9 +41,13 @@ ifndef $(2)_KCONFIG_FILE $$(error Internal error: no value specified for $(2)_KCONFIG_FILE) endif +# The config file could be in-tree, so before depending on it the package should +# be extracted (and patched) first +$$($(2)_KCONFIG_FILE): | $(1)-patch + # The .config file is obtained by copying it from the specified source # configuration file, after the package has been patched. -$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) | $(1)-patch +$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$(INSTALL) -m 0644 $$($(2)_KCONFIG_FILE) $$($(2)_DIR)/.config # In order to get a usable, consistent configuration, some fixup may be needed. -- 2.30.2