From b85bdae04dfc1e4235a206de60b3743a243510dd Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 8 Apr 2015 19:08:34 +0200 Subject: [PATCH] infra/pkg-kconfig: don't require a kconfig file for disabled packages When a package is not enabled, we need not check that it provides a .config/defconfig file. So far, all our pkg-kconfig packages unconditionally set their _KCONFIG_FILE, even to an empty value. But some packages (e.g. at91bootstrap3) wanted to set it only when enabled, and broke. So, only do the check when the package is enabled. Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/pkg-kconfig.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 04ac37df42..fd9f19d949 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -36,11 +36,6 @@ $(2)_KCONFIG_EDITORS ?= menuconfig $(2)_KCONFIG_OPTS ?= $(2)_KCONFIG_FIXUP_CMDS ?= -# FOO_KCONFIG_FILE is required -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 @@ -72,6 +67,11 @@ $$($(2)_TARGET_CONFIGURE): $$($(2)_DIR)/.stamp_kconfig_fixup_done # already called above, so we can effectively use this variable. ifeq ($$($$($(2)_KCONFIG_VAR)),y) +# FOO_KCONFIG_FILE is required +ifndef $(2)_KCONFIG_FILE +$$(error Internal error: no value specified for $(2)_KCONFIG_FILE) +endif + # Configuration editors (menuconfig, ...) $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $$($(2)_DIR)/.stamp_kconfig_fixup_done $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ -- 2.30.2