From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Sun, 4 Oct 2015 13:35:17 +0100 Subject: [Buildroot] [PATCH v4 1/3] toolchain-external: strip trailing slash from autogenerated FOO_SITE In-Reply-To: <1443892938-17039-2-git-send-email-luca@lucaceresoli.net> References: <1443892938-17039-1-git-send-email-luca@lucaceresoli.net> <1443892938-17039-2-git-send-email-luca@lucaceresoli.net> Message-ID: <56111D05.2090901@mind.be> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On 03-10-15 18:22, Luca Ceresoli wrote: > Trailing slashes are going to be declared illegal from FOO_SITE > variables. > > But Buildroot internally generates such a variable when using a custom > external toolchain (i.e. BR2_TOOLCHAIN_EXTERNAL_CUSTOM). This is > because TOOLCHAIN_EXTERNAL_SITE is set to > $(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL))), and $(dir) > leaves a trailing slash. > > Fix it using patsubst, just like linux and the bootloaders do. > > Signed-off-by: Luca Ceresoli > Reported-by: Thomas Petazzoni > Cc: Thomas Petazzoni > Cc: Arnout Vandecappelle Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Regards, Arnout > > --- > > This patch is new in v4. > --- > toolchain/toolchain-external/toolchain-external.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk > index 79afdaa..4a3a3d0 100644 > --- a/toolchain/toolchain-external/toolchain-external.mk > +++ b/toolchain/toolchain-external/toolchain-external.mk > @@ -416,7 +416,7 @@ endif > TOOLCHAIN_EXTERNAL_SOURCE = arc_gnu_2014.12_prebuilt_uclibc_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ENDIANESS)_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_CORE)_linux_install.tar.gz > else > # Custom toolchain > -TOOLCHAIN_EXTERNAL_SITE = $(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL))) > +TOOLCHAIN_EXTERNAL_SITE = $(patsubst %/,%,$(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))) > TOOLCHAIN_EXTERNAL_SOURCE = $(notdir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL))) > # We can't check hashes for custom downloaded toolchains > BR_NO_CHECK_HASH_FOR += $(TOOLCHAIN_EXTERNAL_SOURCE) > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF