Commit d0185582 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

toolchain/external: use generic extract commands (blackfin case) 



The backfin toolchains come in two archives.

We extract the first (main) archive using the generic extract commands,
while the second is extracted as a post-extract hook.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: default avatarRomain Naour <romain.naour@openwide.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 23ffa7ec

toolchain/toolchain-external/toolchain-external.mk

+16 −15
Original line number Diff line number Diff line
@@ -286,6 +286,16 @@ define TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201505_LIB_NAMES_FIX 
		$(STAGING_DIR)/usr/include/gnu/

endef



# Special handling for Blackfin toolchain, because of the split in two

# tarballs, and the organization of tarball contents. The tarballs

# contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories,

# which themselves contain the toolchain. This is why we strip more

# components than usual.

define TOOLCHAIN_EXTERNAL_BLACKFIN_UCLIBC_EXTRA_EXTRACT

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

		$(TAR) --strip-components=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) -

endef



ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305),y)

TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi

TOOLCHAIN_EXTERNAL_SOURCE = arm-2013.05-24-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
@@ -382,10 +392,14 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1),y) 
TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2013R1/2013R1-RC1/i386

TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2013R1-RC1.i386.tar.bz2

TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2013R1-RC1.i386.tar.bz2

TOOLCHAIN_EXTERNAL_STRIP_COMPONENTS = 3

TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_BLACKFIN_UCLIBC_EXTRA_EXTRACT

else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1),y)

TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2014R1/2014R1-RC2/i386

TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2014R1-RC2.i386.tar.bz2

TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2

TOOLCHAIN_EXTERNAL_STRIP_COMPONENTS = 3

TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_BLACKFIN_UCLIBC_EXTRA_EXTRACT

else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64),y)

ifeq ($(HOSTARCH),x86)

TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/14.09/components/toolchain/binaries
@@ -461,21 +475,8 @@ TOOLCHAIN_EXTERNAL_ADD_TOOLCHAIN_DEPENDENCY = NO 


TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES



ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1),y)

# Special handling for Blackfin toolchain, because of the split in two

# tarballs, and the organization of tarball contents. The tarballs

# contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories,

# which themselves contain the toolchain. This is why we strip more

# components than usual.

define TOOLCHAIN_EXTERNAL_EXTRACT_CMDS

	mkdir -p $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)

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

		$(TAR) --strip-components=3 -C $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) $(TAR_OPTIONS) -

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

		$(TAR) --strip-components=3 -C $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) $(TAR_OPTIONS) -

endef

else ifneq ($(TOOLCHAIN_EXTERNAL_SOURCE),)

# Normal handling of toolchain tarball extraction.

# Normal handling of downloaded toolchain tarball extraction.

ifneq ($(TOOLCHAIN_EXTERNAL_SOURCE),)

TOOLCHAIN_EXTERNAL_EXCLUDES = usr/lib/locale/*



# As a regular package, the toolchain gets extracted in $(@D), but