Commit 1cbffbd0 authored by Shawn J. Goff's avatar Shawn J. Goff Committed by Peter Korsgaard
Browse files

eliminate double slashes caused by FOO_SITE ending in a slash 



When a FOO_SITE variable ends in a slash and gets joined with a
FOO_SOURCE variable like $(FOO_SITE)/$(FOO_SOURCE), the resulting URI
has a double slash. While double-slashes are fine in unix paths, they
are reserved in URIs - the part following '//' must be an authority.

Signed-off-by: default avatarShawn J. Goff <shawn7400@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent c24e66a3

package/perl/perl.mk

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



define PERL_CROSS_DOWNLOAD

	$(call DOWNLOAD,$(PERL_CROSS_SITE)/$(PERL_CROSS_SOURCE))

	$(call DOWNLOAD,$(PERL_CROSS_SITE:/=)/$(PERL_CROSS_SOURCE))

endef

PERL_POST_DOWNLOAD_HOOKS += PERL_CROSS_DOWNLOAD

package/pkg-generic.mk

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ ifeq ($(DL_MODE),DOWNLOAD) 
		done ; \

	fi

endif

	$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE)/$($(PKG)_SOURCE)))

	$(foreach p,$($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE)/$(p))$(sep))

	$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE)))

	$(foreach p,$($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$(p))$(sep))

	$(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep))

ifeq ($(DL_MODE),DOWNLOAD)

	$(Q)mkdir -p $(@D)

toolchain/gcc/gcc-uclibc-4.x.mk

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ ifneq ($(GCC_SNAP_DATE),) 
else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)

 GCC_SITE:=ftp://www.at91.com/pub/buildroot/

else

 GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION)

 GCC_SITE:=$(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION)

endif



GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2
@@ -212,7 +212,7 @@ endif 
$(DL_DIR)/$(GCC_SOURCE):

	mkdir -p $(DL_DIR)

	$(Q)$(call MESSAGE,"Downloading gcc")

	$(call DOWNLOAD,$(GCC_SITE)/$(GCC_SOURCE))

	$(call DOWNLOAD,$(GCC_SITE:/=)/$(GCC_SOURCE))



gcc-unpacked: $(GCC_DIR)/.patched

$(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)

toolchain/kernel-headers/kernel-headers.mk

+3 −3
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ EXTRAVERSION:=$(if $(EXTRAVERSION),.$(EXTRAVERSION),) 


LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL)$(SUBLEVEL)$(EXTRAVERSION)

ifeq ($(findstring x2.6.,x$(DEFAULT_KERNEL_HEADERS)),x2.6.)

LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/

LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR:/=)/linux/kernel/v2.6/

else

LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v3.x/

LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR:/=)/linux/kernel/v3.x/

endif

LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.bz2

LINUX_HEADERS_CAT:=$(BZCAT)
@@ -71,7 +71,7 @@ ifeq ($(BR2_KERNEL_HEADERS_SNAP),y) 
	$(error No local $@ found, cannot continue. Are you sure you wanted to enable BR2_KERNEL_HEADERS_SNAP?)

endif

	$(Q)$(call MESSAGE,"Downloading kernel headers")

	$(call DOWNLOAD,$(LINUX_HEADERS_SITE)/$(LINUX_HEADERS_SOURCE))

	$(call DOWNLOAD,$(LINUX_HEADERS_SITE:/=)/$(LINUX_HEADERS_SOURCE))



kernel-headers: $(LINUX_HEADERS_DIR)/.configured

toolchain/toolchain-external/ext-tool.mk

+2 −2
Original line number Diff line number Diff line
@@ -299,10 +299,10 @@ endif 
# components than usual.

ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)

$(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1):

	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1)/$(TOOLCHAIN_EXTERNAL_SOURCE_1))

	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1:/=:/=)/$(TOOLCHAIN_EXTERNAL_SOURCE_1))



$(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2):

	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_2)/$(TOOLCHAIN_EXTERNAL_SOURCE_2))

	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_2:/=:/=)/$(TOOLCHAIN_EXTERNAL_SOURCE_2))



$(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2)

	mkdir -p $(@D)