Commit 470cd0dc authored Jul 12, 2015 by Eric Le Bihan Committed by Thomas Petazzoni Jul 12, 2015

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 <eric.le.bihan.dev@free.fr>
Cc: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

parent 34ee471f

package/pkg-generic.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)