infra/pkg-generic: use site method for same-site extra downloads
PATCH 1/1 infra/pkg-generic: use site method for same-site extra downloads
When a package specifies extra downloads, it has the option to only name the basename of the extra download, in which case that extra download will be retrieved from the same location the main download is retrieved from.
In that case, if the extra download contains a '+', it would confuse the dl-wrapper, which believes the LHS of the '+' is the site method, and the RHS the actual URI, and so the dl-wrapper mangles and damages the URI when fetching such extra downloads, like that happens with android tools, where the proper URI and mangled URIs of the extra download are, respectively:
https://launchpad.net/ubuntu/+archive/primary/+files/android-tools_4.2.2+git20130218-3ubuntu41.debian.tar.gz http://archive/primary/+files/android-tools_4.2.2+git20130218-3ubuntu41.debian.tar.gz
We fix that by always propagating the site method to extra downloads, but only when they are specified as relative to the main download URI.
For the extra downloads that specify a full URI, it is not systematic that it is the same site method. For example, a main download could be a git clone, but an extra download a pure http download; in that case we can't replicate the site method for extra downloads, so they'll have to take appropriate care to specify the required method and encoding if needed.
--- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-generic.mk +1 -1
@@ -524,7 +524,7 @@ $(2)_ALL_DOWNLOADS = \ $$(if $$($(2)_SOURCE),$$($(2)_SITE_METHOD)+$$($(2)_SITE)/$$($(2)_SOURCE)) \ $$(foreach p,$$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS),\ $$(if $$(findstring ://,$$(p)),$$(p),\ - $$($(2)_SITE)/$$(p))) + $$($(2)_SITE_METHOD)+$$($(2)_SITE)/$$(p))) ifndef $(2)_SITE ifdef $(3)_SITE
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH 1/1 infra/pkg-generic: use site method for same-site extra downloads
Quoted 25 lines · On Fri, 8 Nov 2019 18:26:45 +0100 "Yann E. MORIN" <[email protected]>…
When a package specifies extra downloads, it has the option to only name the basename of the extra download, in which case that extra download will be retrieved from the same location the main download is retrieved from.
In that case, if the extra download contains a '+', it would confuse the dl-wrapper, which believes the LHS of the '+' is the site method, and the RHS the actual URI, and so the dl-wrapper mangles and damages the URI when fetching such extra downloads, like that happens with android tools, where the proper URI and mangled URIs of the extra download are, respectively:
https://launchpad.net/ubuntu/+archive/primary/+files/android-tools_4.2.2+git20130218-3ubuntu41.debian.tar.gz http://archive/primary/+files/android-tools_4.2.2+git20130218-3ubuntu41.debian.tar.gzWe fix that by always propagating the site method to extra downloads, but only when they are specified as relative to the main download URI.
For the extra downloads that specify a full URI, it is not systematic that it is the same site method. For example, a main download could be a git clone, but an extra download a pure http download; in that case we can't replicate the site method for extra downloads, so they'll have to take appropriate care to specify the required method and encoding if needed.
Quoted 6 lines
Reported-by Jemy Zhang <[email protected]>Signed-off-by Yann E. MORIN <[email protected]>Cc Jemy Zhang <[email protected]>--- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 infra/pkg-generic: use site method for same-site extra downloads
In reply to Yann E. MORINQuoted 27 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
When a package specifies extra downloads, it has the option to only name the basename of the extra download, in which case that extra download will be retrieved from the same location the main download is retrieved from.
In that case, if the extra download contains a '+', it would confuse the dl-wrapper, which believes the LHS of the '+' is the site method, and the RHS the actual URI, and so the dl-wrapper mangles and damages the URI when fetching such extra downloads, like that happens with android tools, where the proper URI and mangled URIs of the extra download are, respectively:
https://launchpad.net/ubuntu/+archive/primary/+files/android-tools_4.2.2+git20130218-3ubuntu41.debian.tar.gz http://archive/primary/+files/android-tools_4.2.2+git20130218-3ubuntu41.debian.tar.gzWe fix that by always propagating the site method to extra downloads, but only when they are specified as relative to the main download URI.
For the extra downloads that specify a full URI, it is not systematic that it is the same site method. For example, a main download could be a git clone, but an extra download a pure http download; in that case we can't replicate the site method for extra downloads, so they'll have to take appropriate care to specify the required method and encoding if needed.
Quoted 3 lines
Reported-by Jemy Zhang <[email protected]>Signed-off-by Yann E. MORIN <[email protected]>Cc Jemy Zhang <[email protected]>
Committed to 2019.02.x and 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard