archiver.bbclass: Fix duplicated SRC_URIs for do_ar_original
cover archiver.bbclass: Fix duplicated SRC_URIs for do_ar_original
The following changes since commit 586061c469a3340ec3a60ff59dae2e9ee33c3398:
qemu: fix CVE-2020-11869 (2020-05-19 22:55:50 +0100)
are available in the Git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/ar_srcuri
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/ar_srcuri
Robert Yang (1):
archiver.bbclass: Fix duplicated SRC_URIs for do_ar_original
meta/classes/archiver.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
Signature · 1 line
2.21.0
PATCH 1/1 archiver.bbclass: Fix duplicated SRC_URIs for do_ar_original
The argument urls of bb.fetch2.Fetch(urls, d) are duplicated to SRC_URI, which caused errors like:
bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception FetchError: Fetcher failure: The SRCREV_FORMAT variable must be set when multiple SCMs are used. The SCMs are:git://github.com/docker/notary.git;destsuffix=git/src/github.com/docker/notarygit://github.com/docker/notary.git
The first one is from original SRC_URI, the second one is from the variable 'urls', so cleanup SRC_URI before call bb.fetch2.Fetch() can fix the problem.
--- meta/classes/archiver.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
meta/classes/archiver.bbclass +7 -1
@@ -193,7 +193,13 @@ python do_ar_original() { del decoded[5][param] encoded = bb.fetch2.encodeurl(decoded) urls[i] = encoded - fetch = bb.fetch2.Fetch(urls, d) + + # Cleanup SRC_URI before call bb.fetch2.Fetch() since now SRC_URI is in the + # variable "urls", otherwise there might be errors like: + # The SRCREV_FORMAT variable must be set when multiple SCMs are used + ld = bb.data.createCopy(d) + ld.setVar('SRC_URI', '') + fetch = bb.fetch2.Fetch(urls, ld) tarball_suffix = {} for url in fetch.urls: local = fetch.localpath(url).rstrip("/");
Signature · 1 line
2.21.0
Quoted 25 lines · Robert Yang
The argument urls of
bb.fetch2.Fetch(urls, d)are duplicated toSRC_URI, which caused errors like:bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception FetchError: Fetcher failure: The
SRCREV_FORMATvariable must be set when multiple SCMs are used. The SCMs are:git://github.com/docker/notary.git;destsuffix=git/src/github.com/docker/notarygit://github.com/docker/notary.gitThe first one is from original
SRC_URI, the second one is from the variable 'urls', so cleanupSRC_URIbefore callbb.fetch2.Fetch()can fix the problem.Signed-off-by Robert Yang <[email protected]>--- meta/classes/archiver.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)meta/classes/archiver.bbclass +0
-1@@ -193,7 +193,13 @@ python do_ar_original() { del decoded[5][param] encoded = bb.fetch2.encodeurl(decoded) urls[i] = encoded - fetch = bb.fetch2.Fetch(urls, d)
meta/classes/archiver.bbclass python do_ar_original() { · line 205
Quoted 10 lines
meta/classes/archiver.bbclass +7
-0+ + # Cleanup SRC_URI before call bb.fetch2.Fetch() since now SRC_URI is in the + # variable "urls", otherwise there might be errors like: + # The SRCREV_FORMAT variable must be set when multiple SCMs are used + ld = bb.data.createCopy(d) + ld.setVar('SRC_URI', '') + fetch = bb.fetch2.Fetch(urls, ld) tarball_suffix = {} for url in fetch.urls: local = fetch.localpath(url).rstrip("/");
Well found! I've starred at that code for a different issue and not spotted that!
Cheers,
Richard