jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2015-07-12 13:51:59 +02:00
parent 5e0ccea25f
commit 22ed697d11
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gcc/gcc.mk
View File

@ -53,7 +53,7 @@ endef
define HOST_GCC_EXTRACT_CMDS define HOST_GCC_EXTRACT_CMDS
$(call suitable-extractor,$(GCC_SOURCE)) $(DL_DIR)/$(GCC_SOURCE) | \ $(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='libjava/*' \
--exclude='libgo/*' \ --exclude='libgo/*' \
--exclude='gcc/testsuite/*' \ --exclude='gcc/testsuite/*' \

2
package/lsof/lsof.mk
View File

@ -34,7 +34,7 @@ endif
define LSOF_EXTRACT_CMDS define LSOF_EXTRACT_CMDS
$(call suitable-extractor,$(LSOF_SOURCE)) $(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) -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 endef
define LSOF_CONFIGURE_CMDS define LSOF_CONFIGURE_CMDS

4
package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk
View File

@ -37,11 +37,11 @@ define NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER
$(INSTALL) -d $(@D)/nv_tegra/nvidia_drivers $(INSTALL) -d $(@D)/nv_tegra/nvidia_drivers
$(call suitable-extractor,$(@D)/nv_tegra/nvidia_drivers.tbz2) \ $(call suitable-extractor,$(@D)/nv_tegra/nvidia_drivers.tbz2) \
$(@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 $(INSTALL) -d $(@D)/nv_tegra/nv_sample_apps/nvgstapps
$(call suitable-extractor,$(@D)/nv_tegra/nv_sample_apps/nvgstapps.tbz2) \ $(call suitable-extractor,$(@D)/nv_tegra/nv_sample_apps/nvgstapps.tbz2) \
$(@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 endef
NVIDIA_TEGRA23_BINARIES_POST_EXTRACT_HOOKS += NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER NVIDIA_TEGRA23_BINARIES_POST_EXTRACT_HOOKS += NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER

4
package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk
View File

@ -16,11 +16,11 @@ define NVIDIA_TEGRA23_CODECS_EXTRACT_CMDS
$(INSTALL) -d $(@D) $(INSTALL) -d $(@D)
$(call suitable-extractor,$(NVIDIA_TEGRA23_CODECS_SOURCE)) \ $(call suitable-extractor,$(NVIDIA_TEGRA23_CODECS_SOURCE)) \
$(DL_DIR)/$(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 $(INSTALL) -d $(@D)/restricted_codecs
$(call suitable-extractor,$(@D)/restricted_codecs.tbz2) \ $(call suitable-extractor,$(@D)/restricted_codecs.tbz2) \
$(@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 endef
define NVIDIA_TEGRA23_CODECS_INSTALL_TARGET_CMDS define NVIDIA_TEGRA23_CODECS_INSTALL_TARGET_CMDS

2
package/perl/perl.mk
View File

@ -28,7 +28,7 @@ PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod
# together with perl # together with perl
define PERL_CROSS_EXTRACT define PERL_CROSS_EXTRACT
$(call suitable-extractor,$(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) - $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) -
endef endef
PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT

6
toolchain/toolchain-external/toolchain-external.mk
View File

@ -417,16 +417,16 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2)$(BR2_TOOLCHAIN_EXTERNAL_
define TOOLCHAIN_EXTERNAL_EXTRACT_CMDS define TOOLCHAIN_EXTERNAL_EXTRACT_CMDS
mkdir -p $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) mkdir -p $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)
$(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_SOURCE)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE) | \ $(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_SOURCE)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE) | \
$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) $(TAR_OPTIONS) - $(TAR) --strip-components=3 --hard-dereference -C $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) $(TAR_OPTIONS) -
$(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS) | \ $(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS) | \
$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) $(TAR_OPTIONS) - $(TAR) --strip-components=3 --hard-dereference -C $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) $(TAR_OPTIONS) -
endef endef
else ifneq ($(TOOLCHAIN_EXTERNAL_SOURCE),) else ifneq ($(TOOLCHAIN_EXTERNAL_SOURCE),)
# Normal handling of toolchain tarball extraction. # Normal handling of toolchain tarball extraction.
define TOOLCHAIN_EXTERNAL_EXTRACT_CMDS define TOOLCHAIN_EXTERNAL_EXTRACT_CMDS
mkdir -p $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) mkdir -p $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)
$(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_SOURCE)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE) | \ $(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_SOURCE)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE) | \
$(TAR) $(TAR_STRIP_COMPONENTS)=1 --exclude='usr/lib/locale/*' -C $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) $(TAR_OPTIONS) - $(TAR) --strip-components=1 --exclude='usr/lib/locale/*' -C $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) $(TAR_OPTIONS) -
$(TOOLCHAIN_EXTERNAL_FIXUP_CMDS) $(TOOLCHAIN_EXTERNAL_FIXUP_CMDS)
endef endef
endif endif