[Buildroot] [git commit] pkg-generic.mk: fix FOO_ACTUAL_SOURCE_TARBALL handling after DOWNLOAD rework

Peter Korsgaard peter at korsgaard.com
Tue Apr 3 09:50:02 UTC 2018


commit: https://git.buildroot.net/buildroot/commit/?id=0a1576e82d5996cc1f73e8960706ebe4a2909b5f
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Fixes:
http://autobuild.buildroot.net/results/b4a/b4af0de4ae9630ccbe7890f69047f216f2ff5119/

With the change to the DOWNLOAD macro, packages using FOO_ACTUAL_SOURCE_TARBALL fails:

>>> skeleton-init-common  Collecting legal info
sourceryg++-2017.05-4-nios2-linux-gnu.src.tar.bz2: OK (md5: 529a7fecf33d0d113a446413b9d1e173)
sourceryg++-2017.05-4-nios2-linux-gnu.src.tar.bz2: OK (sha256: 6e65878d0453708ee19098d3d68985bda244938d35999f3859915a2f5574fa08)
/bin/bash: line 1: @mkdir: command not found
package/pkg-generic.mk:148: recipe for target '/accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-1/output/build/toolchain-external-codesourcery-niosII-2017.05-4/.stamp_actual_downloaded' failed

Which is caused by the continuation character '\'.  This has been present
since the make target was introduced in commit eace9d6133b9
(core/legal-info: ensure legal-info works in off-line mode).  It isn't clear
to me why it was done like that, but it fails with the DOWNLOAD macro
rework, so drop it.

Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 3c6a1839ff..1c9dd1d734 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -145,7 +145,7 @@ $(BUILD_DIR)/%/.stamp_downloaded:
 
 # Retrieve actual source archive, e.g. for prebuilt external toolchains
 $(BUILD_DIR)/%/.stamp_actual_downloaded:
-	$(call DOWNLOAD,$($(PKG)_ACTUAL_SOURCE_SITE)/$($(PKG)_ACTUAL_SOURCE_TARBALL)); \
+	$(call DOWNLOAD,$($(PKG)_ACTUAL_SOURCE_SITE)/$($(PKG)_ACTUAL_SOURCE_TARBALL))
 	$(Q)mkdir -p $(@D)
 	$(Q)touch $@
 


More information about the buildroot mailing list