[Buildroot] [PATCH] Fix selection of bootloaders from $(BR2_EXTERNAL)

[Eric Le Bihan]

Hi!

On Thu, Sep 25, 2014 at 08:00:52PM +0200, Thomas De Schampheleire wrote:
> Eric Le Bihan <eric.le.bihan.dev at free.fr> schreef:
> >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.
> >
> >Signed-off-by: Eric Le Bihan <eric.le.bihan.dev at free.fr>
> >---
> > package/pkg-generic.mk | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> >diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> >index d04fd36..064d736 100644
> >--- a/package/pkg-generic.mk
> >+++ b/package/pkg-generic.mk
> >@@ -616,6 +616,8 @@ ifeq ($(1),linux)
> > $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL
> > else ifneq ($$(filter boot/%,$(pkgdir)),)
> > $(2)_KCONFIG_VAR = BR2_TARGET_$(2)
> >+else ifneq ($$(filter $(BR2_EXTERNAL)/boot/%,$(pkgdir)),)
> >+$(2)_KCONFIG_VAR = BR2_TARGET_$(2)
>
> filter accepts multiple patterns, so you can edit the existing block.

Thanks for the tip!

> Also, the same problem would exist for the other
>  package types in this if-else structure. Granted, it's
>  less likely that a user will add a new kernel type or
>  toolchain type in BR2_EXTERNAL, but isn't it more
>  logical and symmetrical to apply this change for the
>  rest the if-else block too?

For the kernel, the matching is done on the package name ('linux'), not on the
location of the Makefile. If Buildroot managed multiple kernels, using a
hierarchy such as 'kernel/linux' and 'kernel/minix', then it would be logical
to add a match on kernel/% or $(BR2_EXTERNAL)/kernel/%. As this is not the
case, I think it would be best to keep it the way it is.

For the toolchain, it is true that a user may add a new type of toolchain
building in $(BR2_EXTERNAL)/toolchain (though I can not think of one ATM). So
I will update the pattern matching for this case.

I'll send an improved patch.

Best regards,
ELB