]> code.ossystems Code Review - openembedded-core.git/commit
archiver.bbclass: Fix duplicated SRC_URIs for do_ar_original
authorRobert Yang <liezhi.yang@windriver.com>
Thu, 21 May 2020 04:05:56 +0000 (21:05 -0700)
committerSteve Sakoman <steve@sakoman.com>
Tue, 26 May 2020 16:49:56 +0000 (06:49 -1000)
commita7f50876f95a9be9fe045af1e4efddfe53a983f5
treecc9f4c49df1f286222f1e7a87c582895fec732b5
parentbc6e27aeed5d536d2b764949c307f260f78b7810
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/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.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b244c4f3427cd07376d4b8f7d27e38735bcc90e7)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes/archiver.bbclass