mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

archiver.bbclass: Fix duplicated SRC_URIs for do_ar_original

Browse Source 
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/notary
git://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.

(From OE-Core rev: b244c4f3427cd07376d4b8f7d27e38735bcc90e7)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2020-05-20 21:05:56 -07:00
committed by Richard Purdie
parent 6b9b423735
commit b38f320a3c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/archiver.bbclass
+7 -1
View File
@@ -193,7 +193,13 @@ python do_ar_original() {
del decoded[5][param] del decoded[5][param]
encoded = bb.fetch2.encodeurl(decoded) encoded = bb.fetch2.encodeurl(decoded)
urls[i] = encoded 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 = {} tarball_suffix = {}
for url in fetch.urls: for url in fetch.urls:
local = fetch.localpath(url).rstrip("/"); local = fetch.localpath(url).rstrip("/");