[OE-core] [PATCH 16/40] classes/distrodata: split SRC_URI properly before determining type
Robert Yang
liezhi.yang at windriver.com
Mon Dec 28 07:14:24 UTC 2015
From: Paul Eggleton <paul.eggleton at linux.intel.com>
We weren't splitting SRC_URI values containing multiple URIs here; this
didn't cause any errors except when a trailing ; was left on a URI, in
which case the next URI was considered part of the parameter, which
didn't contain a = and therefore was considered invalid.
We only care about the first URI in SRC_URI in this context (since
that's the upstream URI by convention) so split it as we should and take
the first item.
Fixes [YOCTO #8645].
(From OE-Core master rev: 8e75b7e7d54e5638b42b9e7f90f2c6c17e62033f)
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/distrodata.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 5a4c1b6..44c06e1 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -271,9 +271,9 @@ python do_checkpkg() {
from bb.fetch2 import FetchError, NoMethodError, decodeurl
"""first check whether a uri is provided"""
- src_uri = d.getVar('SRC_URI', True)
+ src_uri = (d.getVar('SRC_URI', True) or '').split()
if src_uri:
- uri_type, _, _, _, _, _ = decodeurl(src_uri)
+ uri_type, _, _, _, _, _ = decodeurl(src_uri[0])
else:
uri_type = "none"
--
1.7.9.5
More information about the Openembedded-core
mailing list