[Buildroot] [pull request] Pull request for branch for-2011.11/pkg-infra-urgent

[Buildroot] [pull request] Pull request for branch for-2011.11/pkg-infra-urgent

[Thomas Petazzoni]

Hello,

Here is an urgent fix that follows the changes in the package
infrastructure. Unfortunately, those changes break the build of
bootloaders (they are ignored by the build process).

Thomas

The following changes since commit 8511728696a298ccdb8b902b60ab398d8f67e745:

  gnutls: bump to version 2.10.5 (2011-09-30 08:26:08 +0200)

are available in the git repository at:
  http://free-electrons.com/~thomas/buildroot.git for-2011.11/pkg-infra-urgent

Thomas Petazzoni (1):
      package: fix bootloader building

 package/Makefile.package.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Thanks,
-- 
Thomas Petazzoni

[Buildroot] [PATCH 1/1] package: fix bootloader building

[Thomas Petazzoni]

The changes in e055aea216cff4d12cf55eab2e35ca1459edaa91 and
0849e8193ef429f29945b8c2a54eafc8635e0969 have broken the bootloader
support.

This is because the 'pkgparentdir' macro returns the string 'boot/'
for bootloaders, while the GENTARGETS_INNER macro was testing this
against 'boot' to know if the configuration option to check for this
package is BR2_PACKAGE_* or BR2_TARGET_*.

So, instead of testing against 'boot', we test against 'boot/'.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Makefile.package.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 353ba72..b5ef57b 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -637,7 +637,7 @@ $$($(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 ifeq ($(4),boot)
+else ifeq ($(4),boot/)
 $(2)_KCONFIG_VAR = BR2_TARGET_$(2)
 else
 $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2)
-- 
1.7.4.1

[Buildroot] [PATCH 1/1] package: fix bootloader building

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> The changes in e055aea216cff4d12cf55eab2e35ca1459edaa91 and
 Thomas> 0849e8193ef429f29945b8c2a54eafc8635e0969 have broken the bootloader
 Thomas> support.

 Thomas> This is because the 'pkgparentdir' macro returns the string 'boot/'
 Thomas> for bootloaders, while the GENTARGETS_INNER macro was testing this
 Thomas> against 'boot' to know if the configuration option to check for this
 Thomas> package is BR2_PACKAGE_* or BR2_TARGET_*.

 Thomas> So, instead of testing against 'boot', we test against 'boot/'.

Committed, thanks.

-- 
Bye, Peter Korsgaard