From 470cd0dcada5c2df8c84d89dba1077ad74d1e599 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Sun, 12 Jul 2015 19:27:01 +0200 Subject: [PATCH] Fix selection of bootloaders from $(BR2_EXTERNAL) If a package is based on "generic-package", pkg-generic.mk will compute the name of the Kconfig variable to use for checking if this package has been selected by the user. Unfortunately, this mechanism does not take into account the case where a bootloader is declared in a $(BR2_EXTERNAL)/boot directory. So, even if the bootloader has been selected, it will not be added to $(TARGETS) and will not be built. This patch fixes this issue. [Arnout: use single filter line, also apply this to toolchain] Signed-off-by: Eric Le Bihan Cc: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 82376df0e0..e85b4bf047 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -642,9 +642,9 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) # kernel case, the bootloaders case, and the normal packages case. ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL -else ifneq ($$(filter boot/%,$(pkgdir)),) +else ifneq ($$(filter boot/% $(BR2_EXTERNAL)/boot/%,$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_TARGET_$(2) -else ifneq ($$(filter toolchain/%,$(pkgdir)),) +else ifneq ($$(filter toolchain/% $(BR2_EXTERNAL)/toolchain/%,$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_$(2) else $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) -- 2.30.2