pkg-generic: Depend on host-{xz, lzip} only for fitting archives
PATCH 1/2 pkg-generic: Depend on host-{xz, lzip} only for fitting archives
results in cleaner dependency graphs, and usually omits host-lzip from being built.
--- package/pkg-generic.mk | 4 ++++ 1 file changed, 4 insertions(+)
package/pkg-generic.mk +4 -0
@@ -607,12 +607,16 @@ $(2)_EXTRACT_DEPENDENCIES += $$(BR2_TAR_HOST_DEPENDENCY) endif ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) +ifneq ($$(filter .xz .lzma,$$(suffix $$($(2)_SOURCE))),) $(2)_EXTRACT_DEPENDENCIES += $$(BR2_XZCAT_HOST_DEPENDENCY) endif +endif ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) +ifeq ($$(suffix $$($(2)_SOURCE)),.lz) $(2)_EXTRACT_DEPENDENCIES += $$(BR2_LZIP_HOST_DEPENDENCY) endif +endif ifeq ($$(BR2_CCACHE),y) ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache,$(1)),)
Signature · 1 line
2.20.1
PATCH 2/2 pkg-generic: Cleanup some redundant checks
--- package/pkg-generic.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
package/pkg-generic.mk +1 -4
@@ -604,18 +604,15 @@ endif ifeq ($$(filter host-tar host-skeleton host-fakedate,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $$(BR2_TAR_HOST_DEPENDENCY) -endif -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) ifneq ($$(filter .xz .lzma,$$(suffix $$($(2)_SOURCE))),) $(2)_EXTRACT_DEPENDENCIES += $$(BR2_XZCAT_HOST_DEPENDENCY) endif -endif -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) ifeq ($$(suffix $$($(2)_SOURCE)),.lz) $(2)_EXTRACT_DEPENDENCIES += $$(BR2_LZIP_HOST_DEPENDENCY) endif + endif ifeq ($$(BR2_CCACHE),y)
Signature · 1 line
2.20.1
PATCH 2/2 pkg-generic: Cleanup some redundant checks
Hello,
Quoted 15 lines · On Fri, 15 Mar 2019 22:47:40 +0100 Norbert Lange <[email protected]> wrote:
Signed-off-by Norbert Lange <[email protected]>--- package/pkg-generic.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)package/pkg-generic.mk +0
-1@@ -604,18 +604,15 @@ endif ifeq ($$(filter host-tar host-skeleton host-fakedate,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $$(BR2_TAR_HOST_DEPENDENCY) -endif
package/pkg-generic.mk endif · line 614
Quoted 10 lines
package/pkg-generic.mk +0
-3-ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) ifneq ($$(filter .xz .lzma,$$(suffix $$($(2)_SOURCE))),) $(2)_EXTRACT_DEPENDENCIES += $$(BR2_XZCAT_HOST_DEPENDENCY) endif -endif -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) ifeq ($$(suffix $$($(2)_SOURCE)),.lz) $(2)_EXTRACT_DEPENDENCIES += $$(BR2_LZIP_HOST_DEPENDENCY) endif
I think the commit log needs to be extended to explain why they are not redundant anymore. I guess the explanation is that the host-xz and host-lzip sources are not respectively packed as .xz archive and .lz archives, so thanks to your PATCH 1/2, host-xz is already not going to be added to the dependencies of host-xz, and host-lzip is not going to be added to the dependencies of host-lzip. But since that's not trivial, the commit log should explain, at the very least.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com