From patchwork Fri Apr 12 16:53:00 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: 236161 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 BBD3C2C00B9 for ; Sat, 13 Apr 2013 02:54:21 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CB43E10BC55; Fri, 12 Apr 2013 16:54:02 +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 IMOofrQ8oCAb; Fri, 12 Apr 2013 16:53:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 46E3C10BC0B; Fri, 12 Apr 2013 16:53:59 +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 5EFC68F753 for ; Fri, 12 Apr 2013 16:54:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CC1FD8DA9B for ; Fri, 12 Apr 2013 16:54:14 +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 OT6ULBDnTxpN for ; Fri, 12 Apr 2013 16:54:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ye0-f169.google.com (mail-ye0-f169.google.com [209.85.213.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id 497068D924 for ; Fri, 12 Apr 2013 16:54:13 +0000 (UTC) Received: by mail-ye0-f169.google.com with SMTP id q14so443719yen.14 for ; Fri, 12 Apr 2013 09:54:12 -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; bh=JqH/lDUkKPIaDT9asvwMxRgd6Uxp6FnBWWw72a6ZLU4=; b=tegBqABJFLog0KBw9+ow2szRK7gwW1htjYubPxj50FIWwRjSbeVfxXcwkKJiDrid4x 5Jw8D4ms5uarl2AmiNwxyLb4rvoLWHboYA6RghYf9lNx+FBPIoMWZBXLVsyMwMdDZYgM u+snP0AeuWLXQBR2DOGZarjvp+SlOzE+Q0+uNSkLTzuyH3vIzm/mP+Hq7b4h0SmQjJFT X84Q/bZ5WDpw8TGz1lEeRA663c0KxgFT9dJ0qjQRA8FVzWEEMcM/yM86x1dnNmEOtGRX cadaGinLkO9i1+TcVxTG5et812LaljLuQlKQNTxfaT5HADOw8fliFCKfSkUd3FFVMuud 7btQ== X-Received: by 10.236.198.80 with SMTP id u56mr7279611yhn.32.1365785652319; Fri, 12 Apr 2013 09:54:12 -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 b78sm12768383yhi.2.2013.04.12.09.54.10 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Apr 2013 09:54:11 -0700 (PDT) From: "Shawn J. Goff" To: buildroot@busybox.net Date: Fri, 12 Apr 2013 12:53:00 -0400 Message-Id: <1365785580-1868-1-git-send-email-shawn7400@gmail.com> X-Mailer: git-send-email 1.8.1.5 Cc: "Shawn J. Goff" Subject: [Buildroot] [PATCH] eliminate double slashes caused by _SITEs 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. Signed-off-by: Shawn J. Goff --- package/perl/perl.mk | 2 +- package/pkg-generic.mk | 4 ++-- toolchain/gdb/gdb.mk | 2 +- toolchain/kernel-headers/kernel-headers.mk | 2 +- toolchain/toolchain-external/ext-tool.mk | 4 ++-- toolchain/uClibc/uclibc.mk | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/perl/perl.mk b/package/perl/perl.mk index f3c73dd..2c317ec 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -22,7 +22,7 @@ PERL_CROSS_SOURCE = perl-5.$(PERL_VERSION_MAJOR).0-cross-$(PERL_CROSS_VERSION). # 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 6fcd359..3246973 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -32,8 +32,8 @@ ifeq ($(DL_MODE),DOWNLOAD) (test -z $($(PKG)_PATCH) || test -e $(DL_DIR)$($(PKG)_PATCH))) || \ $(call MESSAGE,"Downloading") endif - $(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE)/$($(PKG)_SOURCE))) - $(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE)/$($(PKG)_PATCH))) + $(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE))) + $(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_PATCH))) $(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) ifeq ($(DL_MODE),DOWNLOAD) $(Q)mkdir -p $(@D) diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk index 4b8fe3a..e34a31c 100644 --- a/toolchain/gdb/gdb.mk +++ b/toolchain/gdb/gdb.mk @@ -19,7 +19,7 @@ endif GDB_DIR:=$(TOOLCHAIN_DIR)/gdb-$(GDB_VERSION) $(DL_DIR)/$(GDB_SOURCE): - $(call DOWNLOAD,$(GDB_SITE)/$(GDB_SOURCE)) + $(call DOWNLOAD,$(GDB_SITE:/=)/$(GDB_SOURCE)) gdb-unpacked: $(GDB_DIR)/.unpacked $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE) diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 568c192..7f2976e 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -76,7 +76,7 @@ $(DL_DIR)/$(LINUX_HEADERS_SOURCE): ifeq ($(BR2_KERNEL_HEADERS_SNAP),y) $(error No local $@ found, cannot continue. Are you sure you wanted to enable BR2_KERNEL_HEADERS_SNAP?) endif - $(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 8ce0a84..f176f3e 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -279,10 +279,10 @@ endif # components than usual. ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1),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 055267c..279d2b6 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -62,7 +62,7 @@ UCLIBC_LOCALES = $(foreach locale,$(GENERATE_LOCALE),\ endif $(DL_DIR)/$(UCLIBC_SOURCE): - $(call DOWNLOAD,$(UCLIBC_SITE)/$(UCLIBC_SOURCE)) + $(call DOWNLOAD,$(UCLIBC_SITE:/=)/$(UCLIBC_SOURCE)) uclibc-unpacked: $(UCLIBC_DIR)/.unpacked $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)