diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-07 13:35:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-10 14:46:38 +0100 |
commit | 1f68b0bd98ab0d9aeb7e5dae560d9d505ffac7c3 (patch) | |
tree | fc1d636189ead1d83a5d252bddc5240c5b25db7f /bitbake/lib/bb/siggen.py | |
parent | 32df42cff5370bb0bda51f0f637357c18ee3b1eb (diff) | |
download | poky-1f68b0bd98ab0d9aeb7e5dae560d9d505ffac7c3.tar.gz |
bitbake: multiconfig: Switch from 'multiconfig' -> 'mc'
After real world use its clear the "multiconfig:" prefix to multiconfig tasks,
whilst clear, is also clumbersome. Switch to use the short version instead.
mcdepends will continue to work with "multiconfig:" for now as well. The commandline
will only accept mc: going forward.
[YOCTO #11168]
(Bitbake rev: 821daf093b76504067a8b77dfa4b181af6ec92b4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/siggen.py')
-rw-r--r-- | bitbake/lib/bb/siggen.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index e0a66e68d5..fe580e487f 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -179,7 +179,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
179 | def get_taskhash(self, fn, task, deps, dataCache): | 179 | def get_taskhash(self, fn, task, deps, dataCache): |
180 | 180 | ||
181 | mc = '' | 181 | mc = '' |
182 | if fn.startswith('multiconfig:'): | 182 | if fn.startswith('mc:'): |
183 | mc = fn.split(':')[1] | 183 | mc = fn.split(':')[1] |
184 | k = fn + "." + task | 184 | k = fn + "." + task |
185 | 185 | ||
@@ -194,7 +194,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
194 | depmc = pkgname.split(':')[1] | 194 | depmc = pkgname.split(':')[1] |
195 | if mc != depmc: | 195 | if mc != depmc: |
196 | continue | 196 | continue |
197 | if dep.startswith("multiconfig:") and not mc: | 197 | if dep.startswith("mc:") and not mc: |
198 | continue | 198 | continue |
199 | depname = dataCache.pkg_fn[pkgname] | 199 | depname = dataCache.pkg_fn[pkgname] |
200 | if not self.rundep_check(fn, recipename, task, dep, depname, dataCache): | 200 | if not self.rundep_check(fn, recipename, task, dep, depname, dataCache): |
@@ -412,13 +412,13 @@ def list_inline_diff(oldlist, newlist, colors=None): | |||
412 | 412 | ||
413 | def clean_basepath(a): | 413 | def clean_basepath(a): |
414 | mc = None | 414 | mc = None |
415 | if a.startswith("multiconfig:"): | 415 | if a.startswith("mc:"): |
416 | _, mc, a = a.split(":", 2) | 416 | _, mc, a = a.split(":", 2) |
417 | b = a.rsplit("/", 2)[1] + '/' + a.rsplit("/", 2)[2] | 417 | b = a.rsplit("/", 2)[1] + '/' + a.rsplit("/", 2)[2] |
418 | if a.startswith("virtual:"): | 418 | if a.startswith("virtual:"): |
419 | b = b + ":" + a.rsplit(":", 1)[0] | 419 | b = b + ":" + a.rsplit(":", 1)[0] |
420 | if mc: | 420 | if mc: |
421 | b = b + ":multiconfig:" + mc | 421 | b = b + ":mc:" + mc |
422 | return b | 422 | return b |
423 | 423 | ||
424 | def clean_basepaths(a): | 424 | def clean_basepaths(a): |