diff options
| author |   Ross Burton <ross@burtonini.com> | 2022-03-15 16:23:43 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-16 10:27:22 +0000 |
| commit | d0edb03088d0d1c20c899daed1bb3a7110b19670 (patch) | |
| tree | 63602cf1cf7c945f6a7c062209ffe7a6de9ff350 | |
| parent | 87fd543aa802de1c9d4b234096fff8a1cf929f9a (diff) | |
| download | openembedded-core-contrib-d0edb03088d0d1c20c899daed1bb3a7110b19670.tar.gz | |
devupstream: fix handling of SRC_URI
As the class handler runs before overrides are actually applied we need
to check both SRC_URI:class-devupstream and SRC_URI, otherwise the
automatic assignment of S="${WORKDIR}/git" for git repositories does
not work if the base recipe uses http: but :class-devupstream has a git://
entry instead.
Also, there's no need to set S:class-devupstream, we can just assign to
S here.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/devupstream.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/devupstream.bbclass b/meta/classes/devupstream.bbclass index facc46f3af..ba6dc4136c 100644 --- a/meta/classes/devupstream.bbclass +++ b/meta/classes/devupstream.bbclass @@ -30,10 +30,11 @@ python devupstream_virtclass_handler () { # Develpment releases are never preferred by default d.setVar("DEFAULT_PREFERENCE", "-1") - uri = bb.fetch2.URI(d.getVar("SRC_URI").split()[0]) + src_uri = d.getVar("SRC_URI:class-devupstream") or d.getVar("SRC_URI") + uri = bb.fetch2.URI(src_uri.split()[0]) if uri.scheme == "git" and not d.getVar("S:class-devupstream"): - d.setVar("S:class-devupstream", "${WORKDIR}/git") + d.setVar("S", "${WORKDIR}/git") # Modify the PV if the recipe hasn't already overridden it pv = d.getVar("PV") |