package/waf: purge trailig '/' from WAF_SITE
PATCH 1/1 package/waf: purge trailig '/' from WAF_SITE
<PKG>_SITE cannot have a trailing slash.
--- package/waf/waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/waf/waf.mk +1 -1
@@ -6,7 +6,7 @@ WAF_VERSION = 1.9.5 WAF_SOURCE = waf-$(WAF_VERSION) -WAF_SITE = https://waf.io/ +WAF_SITE = https://waf.io define HOST_WAF_EXTRACT_CMDS $(INSTALL) -D -m 0755 $(HOST_WAF_DL_DIR)/waf-$(WAF_VERSION) $(@D)/waf
Signature · 1 line
2.14.5
PATCH 1/1 package/waf: purge trailig '/' from WAF_SITE
Hello,
Quoted 3 lines · Carlos Santos
<PKG>_SITE cannot have a trailing slash.
Signed-off-by Carlos Santos <[email protected]>
Odd, why isn't our check in package/pkg-generic.mk for trailing slashes triggering on this?
We have this:
ifeq ($$(patsubst %/,ERROR,$$($(2)_SITE)),ERROR) $$(error $(2)_SITE ($$($(2)_SITE)) cannot have a trailing slash) endif
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/waf: purge trailig '/' from WAF_SITE
Quoted 7 lines · Thomas Petazzoni
Hello,
Quoted 3 lines · Carlos Santos
<PKG>_SITE cannot have a trailing slash.
Signed-off-by Carlos Santos <[email protected]>
Quoted 8 lines
Odd, why isn't our check in
package/pkg-generic.mkfor trailing slashes triggering on this?We have this:
ifeq ($$(patsubst %/,ERROR,$$($(2)_SITE)),ERROR) $$(error $(2)_SITE ($$($(2)_SITE)) cannot have a trailing slash) endif
Because that check is within
ifeq ($$($$($(2)_KCONFIG_VAR)),y)
...
endif
and these packages are host-only packages.
It has to be within that condition, since the _SITE may be set only or
differently based on kconfig options which are only set when the package is selected. I tested and it fails for instance on arm-trusted-firmware if that package is not selected.
We need Config.in.host :-)
Regards,
Arnout
PATCH 1/1 package/waf: purge trailig '/' from WAF_SITE
Hello,
Quoted 7 lines · Arnout Vandecappelle
Because that check is within
ifeq ($$($$($(2)_KCONFIG_VAR)),y)
...
endifand these packages are host-only packages.
Aah, indeed.
Quoted 6 lines
It has to be within that condition, since the
_SITEmay be set only or
differently based on kconfig options which are only set when the package is selected. I tested and it fails for instance on arm-trusted-firmware if that package is not selected.We need Config.in.host :-)
Hehe, yes, we do :)
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/waf: purge trailig '/' from WAF_SITE
In reply to Carlos SantosQuoted 3 lines · Carlos Santos
<PKG>_SITE cannot have a trailing slash.
Signed-off-by Carlos Santos <[email protected]>
Committed to master after fixing the type in the commit title and adding an
explanation why this wasn't detected by the check in generic-package.
Regards,
Arnout
Quoted 18 lines
--- package/waf/waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/waf/waf.mk +1
-1@@ -6,7 +6,7 @@ WAF_VERSION = 1.9.5 WAF_SOURCE = waf-$(WAF_VERSION) -WAF_SITE = https://waf.io/ +WAF_SITE = https://waf.io define HOST_WAF_EXTRACT_CMDS $(INSTALL) -D -m 0755 $(HOST_WAF_DL_DIR)/waf-$(WAF_VERSION) $(@D)/waf