From patchwork Fri Apr 12 19:40:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Shawn J. Goff" X-Patchwork-Id: 236184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id E8E2C2C00C5 for ; Sat, 13 Apr 2013 05:40:51 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1CE3010BC36; Fri, 12 Apr 2013 19:40:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Gs1RveOlYugv; Fri, 12 Apr 2013 19:40:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C3E1B102447; Fri, 12 Apr 2013 19:40:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 753928F7A0 for ; Fri, 12 Apr 2013 19:40:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CBD0F8F7D3 for ; Fri, 12 Apr 2013 19:40:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mBMP8wvYEwCQ for ; Fri, 12 Apr 2013 19:40:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-gh0-f173.google.com (mail-gh0-f173.google.com [209.85.160.173]) by whitealder.osuosl.org (Postfix) with ESMTPS id 17AAE8F7C9 for ; Fri, 12 Apr 2013 19:40:41 +0000 (UTC) Received: by mail-gh0-f173.google.com with SMTP id g16so472074ghb.4 for ; Fri, 12 Apr 2013 12:40:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=+B2g7JjZNjRT1dzZBwfezXhT9hRfaNngP3FKDOs7Bm0=; b=Wh7GaLUz8yulte4S1NXnBiUVN5IyONtTgdg/CvQvAbS70nmK9ErXsEpKw8WLf3K7L4 +MFPypXv736NnsFuYKX197vO6GHnkAIlxxa5llADbLppnRYFamk3zaXWzdk3JX/WiU6b 8SiHW4abK8kSLMbD7zMGK4QxBQxnoaEygXMXDd7rIuXJRX9AyalAKkDmlDmWHb9Pe/6y Ba/QgfLePyTRvJ28bwgnCpW6bUvJ4E0aM9HhvPAF/+7tt39tnlXAVjudimb7tM6vHbU7 LoCkT1OHVtZRARa9/HdcweggFhfN1UYONfPZ7xdVSQ2cfzKAzlT+XPmnlAifGA68D2ZB VXIA== X-Received: by 10.236.138.167 with SMTP id a27mr7501777yhj.116.1365795640784; Fri, 12 Apr 2013 12:40:40 -0700 (PDT) Received: from localhost.localdomain (static-108-33-27-66.tampfl.fios.verizon.net. [108.33.27.66]) by mx.google.com with ESMTPS id f27sm13491391yhh.25.2013.04.12.12.40.39 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Apr 2013 12:40:39 -0700 (PDT) From: "Shawn J. Goff" To: buildroot@busybox.net Date: Fri, 12 Apr 2013 15:40:30 -0400 Message-Id: <1365795630-3915-1-git-send-email-shawn7400@gmail.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1365785580-1868-1-git-send-email-shawn7400@gmail.com> References: <1365785580-1868-1-git-send-email-shawn7400@gmail.com> Cc: "Shawn J. Goff" Subject: [Buildroot] [PATCH v2] eliminate double slashes caused by FOO_SITE ending in a slash X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Shawn J. Goff" 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. --- package/perl/perl.mk | 2 +- package/pkg-generic.mk | 4 ++-- toolchain/gcc/gcc-uclibc-4.x.mk | 4 ++-- toolchain/kernel-headers/kernel-headers.mk | 6 +++--- toolchain/toolchain-external/ext-tool.mk | 4 ++-- toolchain/uClibc/uclibc.mk | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 66f7daa..42512f8 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -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 diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 901bcf7..e6bc955 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -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) diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 9d131d5..fc11ad4 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -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) diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 7ce6264..adf7bc4 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -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 diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk index 5c5935c..afdbc5b 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -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) diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 113dc79..2249651 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -63,7 +63,7 @@ endif $(DL_DIR)/$(UCLIBC_SOURCE): $(Q)$(call MESSAGE,"Downloading uClibc") - $(call DOWNLOAD,$(UCLIBC_SITE)/$(UCLIBC_SOURCE)) + $(call DOWNLOAD,$(UCLIBC_SITE:/=)/$(UCLIBC_SOURCE)) uclibc-unpacked: $(UCLIBC_DIR)/.unpacked $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)