[Buildroot] [PATCH 1 of 3] infra: remove trailing slash from pkgparentdir function

Thomas De Schampheleire patrickdepinguin at gmail.com
Thu Nov 7 16:26:51 UTC 2013

For a package located in package/foo/foo.mk, the pkgparentdir function
returns "package/". For a package located in boot/barebox/barebox.mk, it
returns "boot/". For linux/linux.mk, it returns the empty string.

There is actually no reason for the trailing slash in this function.
In the package 'Patching' message, it causes a double slash:
>>> host-lzop 1.03 Patching package//lzop
due to:
@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)")
(FOO_DIR_PREFIX is populated from pkgparentdir)

While the printing of 'package//lzop' in the message above is not useful,
and will be removed in a subsequent following patch, this patch removes
the unnecessary trailing slash in pkgparentdir anyhow

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire at gmail.com>

 package/pkg-generic.mk |  2 +-
 package/pkg-utils.mk   |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -473,7 +473,7 @@ endif
 # kernel case, the bootloaders case, and the normal packages case.
 ifeq ($(1),linux)
-else ifeq ($(4),boot/)
+else ifeq ($(4),boot)
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -52,7 +52,7 @@ endef
 # package, for which the package directory is an empty string.
 pkgdir       = $(dir $(lastword $(MAKEFILE_LIST)))
 pkgname      = $(lastword $(subst /, ,$(call pkgdir)))
-pkgparentdir = $(patsubst %$(call pkgname)/,%,$(call pkgdir))
+pkgparentdir = $(patsubst %/,%,$(patsubst %$(call pkgname)/,%,$(call pkgdir)))
 # Define extractors for different archive suffixes
 INFLATE.bz2  = $(BZCAT)

More information about the buildroot mailing list