From 579fea227394db02916d7487762c79a8e76e8748 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Wed, 9 Jan 2013 12:12:44 +0000 Subject: linux, uboot, mxs-bootlets, barebox: avoid double slash in CUSTOM_TARBALL Closes #5846 The $(dir ...) function leaves a slash at the end, so that the LINUX_SITE variable for a custom tarball ends in a slash. The DOWNLOAD macro adds another slash between SITE and SOURCE, which results in a double slash in the download URL. Fix this by stripping off the final slash from the _SITE in all packages that have a custom tarball. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot/barebox/barebox.mk') diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 6cc497669..211e06eaf 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -9,7 +9,7 @@ BAREBOX_VERSION = $(call qstrip,$(BR2_TARGET_BAREBOX_VERSION)) ifeq ($(BAREBOX_VERSION),custom) # Handle custom Barebox tarballs as specified by the configuration BAREBOX_TARBALL = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION)) -BAREBOX_SITE = $(dir $(BAREBOX_TARBALL)) +BAREBOX_SITE = $(patsubst %/,%,$(dir $(BAREBOX_TARBALL))) BAREBOX_SOURCE = $(notdir $(BAREBOX_TARBALL)) else ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_GIT),y) BAREBOX_SITE = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL)) -- cgit v1.2.3