Commit f8d89f05 authored by Thomas De Schampheleire's avatar Thomas De Schampheleire Committed by Peter Korsgaard
Browse files

infra: introduce suitable-extractor helper function 



In order to simplify determining the right extractor tool for a given
file type, this patch introduces a make function 'suitable-extractor'.
Its usage is $(call suitable-extractor,filename), and it returns the
path to the suitable extractor.

Signed-off-by: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 741cbccb

package/lsof/lsof.mk

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ endif 


# The .tar.bz2 contains another .tar, which contains the source code.

define LSOF_EXTRACT_CMDS

        $(INFLATE.bz2) $(DL_DIR)/$(LSOF_SOURCE) | \

        $(call suitable-extractor,$(LSOF_SOURCE)) $(DL_DIR)/$(LSOF_SOURCE) | \

                $(TAR) -O $(TAR_OPTIONS) - lsof_$(LSOF_VERSION)/lsof_$(LSOF_VERSION)_src.tar | \

        $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(LSOF_DIR) $(TAR_OPTIONS) -

endef

package/perl/perl.mk

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ endef 
PERL_POST_DOWNLOAD_HOOKS += PERL_CROSS_DOWNLOAD



define PERL_CROSS_EXTRACT

	$(INFLATE$(suffix $(PERL_CROSS_SOURCE))) $(DL_DIR)/$(PERL_CROSS_SOURCE) | \

	$(call suitable-extractor,$(PERL_CROSS_SOURCE)) $(DL_DIR)/$(PERL_CROSS_SOURCE) | \

	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -

endef

PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT

package/pkg-generic.mk

+3 −1
Original line number Diff line number Diff line
@@ -539,7 +539,9 @@ else ifeq ($$($(2)_SITE_METHOD),hg) 
DL_TOOLS_DEPENDENCIES += hg

endif # SITE_METHOD



DL_TOOLS_DEPENDENCIES += $(firstword $(INFLATE$(suffix $($(2)_SOURCE))))

# $(firstword) is used here because the extractor can have arguments, like

# ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'.

DL_TOOLS_DEPENDENCIES += $(firstword $(call suitable-extractor,$($(2)_SOURCE)))



endif # $(2)_KCONFIG_VAR

endef # inner-generic-package

package/pkg-utils.mk

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ INFLATE.tbz2 = $(BZCAT) 
INFLATE.tgz  = $(ZCAT)

INFLATE.xz   = $(XZCAT)

INFLATE.tar  = cat

# suitable-extractor(filename): returns extractor based on suffix

suitable-extractor = $(INFLATE$(suffix $(1)))



# MESSAGE Macro -- display a message in bold type

MESSAGE     = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"

package/tar/tar.mk

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ HOST_TAR_SOURCE = tar-$(TAR_VERSION).cpio.gz 
define HOST_TAR_EXTRACT_CMDS

	mkdir -p $(@D)

	cd $(@D) && \

		$(INFLATE.gz) $(DL_DIR)/$(HOST_TAR_SOURCE) | cpio -i

		$(call suitable-extractor,$(HOST_TAR_SOURCE)) $(DL_DIR)/$(HOST_TAR_SOURCE) | cpio -i

	mv $(@D)/tar-$(TAR_VERSION)/* $(@D)

	rmdir $(@D)/tar-$(TAR_VERSION)

endef