Skip to contentSkip to conversation

package/pkg-generic.mk: make HOST_<pkg>_DL_OPTS inherit from <pkg>_DL_OPTS

PATCH New Thomas Petazzoni 2 participants 3 messages Nov 28, 2019 – Dec 5, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/pkg-generic.mk: make HOST_<pkg>_DL_OPTS inherit from <pkg>_DL_OPTS

Just like _SITE, _SOURCE, _SITE_METHOD, it is very likely that if <pkg>_DL_OPTS is defined, the same value should be used for HOST_<pkg>_DL_OPTS, so let's have the same inheritance logic than the one we have for other variables.

Fixes:

https://bugs.busybox.net/show_bug.cgi?id=12321

---
 package/pkg-generic.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/pkg-generic.mk +6 -0
index 7d6fa08418..7b3294a09a 100644
@@ -541,6 +541,12 @@ ifndef $(2)_SITE_METHOD
  endif
 endif
 
+ifndef $(2)_DL_OPTS
+ ifdef $(3)_DL_OPTS
+  $(2)_DL_OPTS = $$($(3)_DL_OPTS)
+ endif
+endif
+
 ifneq ($$(filter bzr cvs hg svn,$$($(2)_SITE_METHOD)),)
 BR_NO_CHECK_HASH_FOR += $$($(2)_SOURCE)
 endif
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 package/pkg-generic.mk: make HOST_<pkg>_DL_OPTS inherit from <pkg>_DL_OPTS

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Just like _SITE, _SOURCE, _SITE_METHOD, it is very likely that if <pkg>_DL_OPTS is defined, the same value should be used for HOST_<pkg>_DL_OPTS, so let's have the same inheritance logic than the one we have for other variables.

Quoted 5 lines

Fixes:

https://bugs.busybox.net/show_bug.cgi?id=12321

Given that this is only used by amd-catalyst in tree, I have applied it to master even though we are this close to release - Thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 package/pkg-generic.mk: make HOST_<pkg>_DL_OPTS inherit from <pkg>_DL_OPTS

In reply to Thomas Petazzoni
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Just like _SITE, _SOURCE, _SITE_METHOD, it is very likely that if <pkg>_DL_OPTS is defined, the same value should be used for HOST_<pkg>_DL_OPTS, so let's have the same inheritance logic than the one we have for other variables.

Quoted 5 lines

Fixes:

https://bugs.busybox.net/show_bug.cgi?id=12321

Committed to 2019.02.x and 2019.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard