Commit 22ed697d authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

packages: do not use TAR_STRIP_COMPONENTS, but directly --strip-components 



Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 5e0ccea2

package/gcc/gcc.mk

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ endef 


define HOST_GCC_EXTRACT_CMDS

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

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

		$(TAR) --strip-components=1 -C $(@D) \

		--exclude='libjava/*' \

		--exclude='libgo/*' \

		--exclude='gcc/testsuite/*' \

package/lsof/lsof.mk

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ endif 
define LSOF_EXTRACT_CMDS

	$(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) -

	$(TAR) --strip-components=1 -C $(LSOF_DIR) $(TAR_OPTIONS) -

endef



define LSOF_CONFIGURE_CMDS

package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk

+2 −2
Original line number Diff line number Diff line
@@ -37,11 +37,11 @@ define NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER 
	$(INSTALL) -d $(@D)/nv_tegra/nvidia_drivers

	$(call suitable-extractor,$(@D)/nv_tegra/nvidia_drivers.tbz2) \

		$(@D)/nv_tegra/nvidia_drivers.tbz2 | \

	$(TAR) $(TAR_STRIP_COMPONENTS)=0 -C $(@D)/nv_tegra/nvidia_drivers/ $(TAR_OPTIONS) -

	$(TAR) --strip-components=0 -C $(@D)/nv_tegra/nvidia_drivers/ $(TAR_OPTIONS) -

	$(INSTALL) -d $(@D)/nv_tegra/nv_sample_apps/nvgstapps

	$(call suitable-extractor,$(@D)/nv_tegra/nv_sample_apps/nvgstapps.tbz2) \

		$(@D)/nv_tegra/nv_sample_apps/nvgstapps.tbz2 | \

	$(TAR) $(TAR_STRIP_COMPONENTS)=0 -C $(@D)/nv_tegra/nv_sample_apps/nvgstapps/ $(TAR_OPTIONS) -

	$(TAR) --strip-components=0 -C $(@D)/nv_tegra/nv_sample_apps/nvgstapps/ $(TAR_OPTIONS) -

endef

NVIDIA_TEGRA23_BINARIES_POST_EXTRACT_HOOKS += NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER

package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk

+2 −2
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ define NVIDIA_TEGRA23_CODECS_EXTRACT_CMDS 
	$(INSTALL) -d $(@D)

	$(call suitable-extractor,$(NVIDIA_TEGRA23_CODECS_SOURCE)) \

		$(DL_DIR)/$(NVIDIA_TEGRA23_CODECS_SOURCE) | \

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

	$(TAR) --strip-components=0 -C $(@D) $(TAR_OPTIONS) -

	$(INSTALL) -d $(@D)/restricted_codecs

	$(call suitable-extractor,$(@D)/restricted_codecs.tbz2) \

		$(@D)/restricted_codecs.tbz2 | \

	$(TAR) $(TAR_STRIP_COMPONENTS)=0 -C $(@D)/restricted_codecs/ $(TAR_OPTIONS) -

	$(TAR) --strip-components=0 -C $(@D)/restricted_codecs/ $(TAR_OPTIONS) -

endef



define NVIDIA_TEGRA23_CODECS_INSTALL_TARGET_CMDS

package/perl/perl.mk

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod 
# together with perl

define PERL_CROSS_EXTRACT

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

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

	$(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) -

endef

PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT