[ptxdist] [PATCH v1 1/2] pre/barebox: only use <PKG>_VERSION to build the URL

[Roland Hieber <rhi@pengutronix.de>]

When adding another barebox package to a BSP, e.g. named barebox-foo,
the BAREBOX_FOO variable will contain "barebox-foo-$(VERSION)". This
variable is used to build BAREBOX_DIR, BAREBOX_SOURCE, and
BAREBOX_FOO_URL.

We must to keep the customized package postfix in the build
directory, but in the latter case, the -foo postfix is transferred
into the URL, which will lead to errors while downloading the source.

We actually only need the barebox version to download the source
tarball, so use a static "barebox-" string to build the barebox/url
macro and also the BAREBOX_FOO_SOURCE variable in the package template,
so the same tarball isn't downloaded multiple times with different
names.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/pre/barebox.make                | 2 +-
 rules/templates/template-barebox-make | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/pre/barebox.make b/rules/pre/barebox.make
index 09fb400b72b2..7875442cf935 100644
--- a/rules/pre/barebox.make
+++ b/rules/pre/barebox.make
@@ -15,14 +15,14 @@ barebox/opts = \
 	HOSTCC=$(HOSTCC) \
 	ARCH=$(PTXCONF_BAREBOX_ARCH_STRING) \
 	CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE)
 
 barebox-opts = \
 	$(call barebox/opts,$(strip $(1)))
 
 barebox/url = \
-	http://www.barebox.org/download/$($(1)).$($(1)_SUFFIX)
+	http://www.barebox.org/download/barebox-$($(1)_VERSION).$($(1)_SUFFIX)
 
 barebox-url = \
 	$(call barebox/url,$(strip $(1)))
 
 # vim: syntax=make
diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
index 282de8846022..7493b849b6ab 100644
--- a/rules/templates/template-barebox-make
+++ b/rules/templates/template-barebox-make
@@ -19,17 +19,17 @@ PACKAGES-$(PTXCONF_BAREBOX_@PACKAGE@) += barebox-@package@
 BAREBOX_@PACKAGE@_VERSION	:= @VERSION@
 BAREBOX_@PACKAGE@_MD5		:=
 BAREBOX_@PACKAGE@		:= barebox-$(BAREBOX_@PACKAGE@_VERSION)
 BAREBOX_@PACKAGE@_SUFFIX	:= tar.bz2
 BAREBOX_@PACKAGE@_DIR		:= $(BUILDDIR)/barebox-@package@-$(BAREBOX_@PACKAGE@_VERSION)
 BAREBOX_@PACKAGE@_CONFIG	:= $(call ptx/in-platformconfigdir, barebox-@package@.config.$(BAREBOX_@PACKAGE@_VERSION))
 BAREBOX_@PACKAGE@_LICENSE	:= GPL-2.0-only
 BAREBOX_@PACKAGE@_URL		:= $(call barebox-url, BAREBOX_@PACKAGE@)
-BAREBOX_@PACKAGE@_SOURCE	:= $(SRCDIR)/$(BAREBOX_@PACKAGE@).$(BAREBOX_@PACKAGE@_SUFFIX)
+BAREBOX_@PACKAGE@_SOURCE	:= $(SRCDIR)/barebox-$(BAREBOX_@PACKAGE@_VERSION).$(BAREBOX_@PACKAGE@_SUFFIX)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
 # use host pkg-config for host tools
 BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
 
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de