Skip to contentSkip to conversation

pkg-generic.mk: fix FOO_ACTUAL_SOURCE_TARBALL handling after DOWNLOAD rework

PATCH New Peter Korsgaard 2 participants 3 messages Apr 3, 2018

lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/1 pkg-generic.mk: fix FOO_ACTUAL_SOURCE_TARBALL handling after DOWNLOAD rework

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

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

Quoted 1 line
Quoted 1 line
Quoted 1 line

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 <[email protected]>
---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-generic.mk +1 -1
index 3c6a1839ff..1c9dd1d734 100644
@@ -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 $@
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 pkg-generic.mk: fix FOO_ACTUAL_SOURCE_TARBALL handling after DOWNLOAD rework

On 2018-04-03 08:56 +0200, Peter Korsgaard spake thusly:

Quoted 11 lines

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

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

Quoted 1 line
Quoted 1 line
Quoted 1 line

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

Quoted 5 lines

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.

No idea why i did that. Probably a bad copy-paste from somewhere else in another .mk...

Quoted 1 line
Signed-off-by Peter Korsgaard <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 20 lines
---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-generic.mk +1 -1
index 3c6a1839ff..1c9dd1d734 100644
@@ -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 $@
Signature · 1 line
2.11.0
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#2 lore raw

PATCH 1/1 pkg-generic.mk: fix FOO_ACTUAL_SOURCE_TARBALL handling after DOWNLOAD rework

In reply to Peter Korsgaard
Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

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

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

Quoted 1 line
Quoted 1 line
Quoted 1 line

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

Quoted 7 lines

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 <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard