infra: misc. changes related to pkgparentdir

Quoted 1 line

Quoted 1 line

host-lzop 1.03 Patching package//lzop

Quoted 1 line

Quoted 1 line

host-lzop 1.03 Patching package//lzop

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:

Quoted 1 line

Quoted 1 line

Quoted 1 line

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 <[email protected]>

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

package/pkg-generic.mk +1 -1

@@ -473,7 +473,7 @@ endif
  # 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)

package/pkg-utils.mk +0 -0

  # Define extractors for different archive suffixes
  INFLATE.bz2  = $(BZCAT)

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

The 'Patching' message in the generic infrastructure prints not only the package name, but also a reference to the assumed package directory, based on FOO_DIR_PREFIX/FOO_RAWNAME. This doesn't really add value, as the name of the package is already apparent from the message and its location should be obvious. Hence, this patch simply reduces the print to "Patching".

Signed-off-by Thomas De Schampheleire <[email protected]>

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

package/pkg-generic.mk +1 -1

@@ -90,7 +90,7 @@ endif
  $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION)
  $(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(call qstrip,$(BR2_GLOBAL_PATCH_DIR))/$(RAWNAME)
  $(BUILD_DIR)/%/.stamp_patched:
-	@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)")
+	@$(call MESSAGE,"Patching")
  	$(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep))
  	$(foreach p,$($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $(notdir $(p))$(sep))
  	$(Q)( \

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 38 lines · Thomas De Schampheleire

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:

Quoted 1 line

Quoted 1 line

Quoted 1 line

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 <[email protected]>

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

package/pkg-generic.mk +1 -1

@@ -473,7 +473,7 @@ endif
  # 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)

package/pkg-utils.mk endef · line 55

Quoted 5 lines

package/pkg-utils.mk +1 -1

@@ -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)))

I wonder if pkgparentdir is even needed anymore. For most cases, we
actually need $(pkgdir). Only for the check against boot/* the parent directory is needed, but that one can be replaced with

else ifneq ($(filter boot/%,$(4)),)

(assuming $(4) is $(pkgdir) instead of $(pkgparentdir)).

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

Variable FOO_DIR_PREFIX is populated from pkgparentdir by the various package infrastructures. However, if that would be empty (which in fact is the case for the linux package), FOO_DIR_PREFIX would be set to '$(TOP_SRCDIR)/package'.
Not only does this make no sense (LINUX_DIR_PREFIX becomes /package/linux, and for all other packages pkgparentdir is not-empty anyway), but it is also using a non-existing variable TOP_SRCDIR.
This patch therefore removes the incorrect default.

Signed-off-by Thomas De Schampheleire <[email protected]>

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

The 'Patching' message in the generic infrastructure prints not only the package name, but also a reference to the assumed package directory, based on FOO_DIR_PREFIX/FOO_RAWNAME. This doesn't really add value, as the name of the package is already apparent from the message and its location should be obvious. Hence, this patch simply reduces the print to "Patching".

Signed-off-by Thomas De Schampheleire <[email protected]>