| Message ID | 20191210215952.902477-5-thomas.petazzoni@bootlin.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Ensure extractor dependencies are taken into account | expand |
Le 10/12/2019 à 22:59, Thomas Petazzoni a écrit : > Instead of manually calculating the EXTRACT_DEPENDENCIES value based > on the archive extension, let's use the newly introduced > extractor-pkg-dependency macro. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Reviewed-by: Romain Naour <romain.naour@smile.fr> Best regards, Romain > --- > package/pkg-generic.mk | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 5ad8f1d894..45a9a133bb 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -644,15 +644,7 @@ $(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)),) > -ifneq ($$(filter .lz,$$(suffix $$($(2)_SOURCE))),) > -$(2)_EXTRACT_DEPENDENCIES += $$(BR2_LZIP_HOST_DEPENDENCY) > -endif > +$(2)_EXTRACT_DEPENDENCIES += $$(call extractor-pkg-dependency,$$($(2)_SOURCE)) > endif > > ifeq ($$(BR2_CCACHE),y) >
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5ad8f1d894..45a9a133bb 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -644,15 +644,7 @@ $(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)),) -ifneq ($$(filter .lz,$$(suffix $$($(2)_SOURCE))),) -$(2)_EXTRACT_DEPENDENCIES += $$(BR2_LZIP_HOST_DEPENDENCY) -endif +$(2)_EXTRACT_DEPENDENCIES += $$(call extractor-pkg-dependency,$$($(2)_SOURCE)) endif ifeq ($$(BR2_CCACHE),y)
Instead of manually calculating the EXTRACT_DEPENDENCIES value based on the archive extension, let's use the newly introduced extractor-pkg-dependency macro. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- package/pkg-generic.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)