diff options
| -rw-r--r-- | meta/classes/base.bbclass | 7 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index d4b11bc7a8..82ec0c9b82 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -549,6 +549,7 @@ python () { elif pn in htincompatwl: bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted for HOSTTOOLS") + needsrcrev = False srcuri = d.getVar('SRC_URI', True) for uri in srcuri.split(): (scheme, _ , path) = bb.fetch.decodeurl(uri)[:3] @@ -559,14 +560,17 @@ python () { # Svn packages should DEPEND on subversion-native if scheme == "svn": + needsrcrev = True d.appendVarFlag('do_fetch', 'depends', ' subversion-native:do_populate_sysroot') # Git packages should DEPEND on git-native elif scheme == "git": + needsrcrev = True d.appendVarFlag('do_fetch', 'depends', ' git-native:do_populate_sysroot') # Mercurial packages should DEPEND on mercurial-native elif scheme == "hg": + needsrcrev = True d.appendVarFlag('do_fetch', 'depends', ' mercurial-native:do_populate_sysroot') # OSC packages should DEPEND on osc-native @@ -593,6 +597,9 @@ python () { elif path.endswith('.src.rpm'): d.appendVarFlag('do_unpack', 'depends', ' file-native:do_populate_sysroot') + if needsrcrev: + d.setVar("SRCPV", "${@bb.fetch2.get_srcrev(d)}") + set_packagetriplet(d) # 'multimachine' handling diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b307f387c0..3837b1e982 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -610,7 +610,8 @@ FETCHCMD_hg = "/usr/bin/env hg" SRCDATE = "${DATE}" SRCREV ??= "INVALID" AUTOREV = "${@bb.fetch2.get_autorev(d)}" -SRCPV = "${@bb.fetch2.get_srcrev(d)}" +# Set Dynamically in base.bbclass +# SRCPV = "${@bb.fetch2.get_srcrev(d)}" SRCPV[vardepvalue] = "${SRCPV}" SRC_URI = "" |