summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-07 13:45:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-10 14:46:38 +0100
commit32df42cff5370bb0bda51f0f637357c18ee3b1eb (patch)
treef8ba4e316a8cea58debd8c1591ca1a19746e8056
parente5217b6c1024f216226443cb8246db9fc090f113 (diff)
downloadpoky-32df42cff5370bb0bda51f0f637357c18ee3b1eb.tar.gz
multiconfig: Adapt to bitbake switch 'multiconfig' -> 'mc'
(From OE-Core rev: 8a6f7c1e455156966f467008645fef14db679ccf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb2
-rw-r--r--meta/lib/oe/sstatesig.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
index 3dbc0f5d15..a76a6bea1b 100644
--- a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
+++ b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
@@ -8,7 +8,7 @@ MCIMGTYPE_virtclass-mcextend-tiny = "cpio.gz"
8 8
9MC_DEPLOY_DIR_IMAGE = "${TOPDIR}/tmp-mc-${MCNAME}/deploy/images/${MCMACHINE}" 9MC_DEPLOY_DIR_IMAGE = "${TOPDIR}/tmp-mc-${MCNAME}/deploy/images/${MCMACHINE}"
10 10
11do_install[mcdepends] += "multiconfig::${MCNAME}:core-image-minimal:do_image_complete multiconfig::${MCNAME}:virtual/kernel:do_deploy" 11do_install[mcdepends] += "mc::${MCNAME}:core-image-minimal:do_image_complete mc::${MCNAME}:virtual/kernel:do_deploy"
12 12
13do_install () { 13do_install () {
14 install -d ${D}/var/lib/machines/${MCNAME} 14 install -d ${D}/var/lib/machines/${MCNAME}
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 417943db90..13af16e473 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -155,7 +155,7 @@ class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
155 else: 155 else:
156 def get_mc(tid): 156 def get_mc(tid):
157 tid = tid.rsplit('.', 1)[0] 157 tid = tid.rsplit('.', 1)[0]
158 if tid.startswith('multiconfig:'): 158 if tid.startswith('mc:'):
159 elems = tid.split(':') 159 elems = tid.split(':')
160 return elems[1] 160 return elems[1]
161 def recipename_from_dep(dep): 161 def recipename_from_dep(dep):