From 32df42cff5370bb0bda51f0f637357c18ee3b1eb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 7 Jun 2019 13:45:17 +0100 Subject: multiconfig: Adapt to bitbake switch 'multiconfig' -> 'mc' (From OE-Core rev: 8a6f7c1e455156966f467008645fef14db679ccf) Signed-off-by: Richard Purdie --- .../recipes-test/multiconfig/multiconfig-image-packager_0.1.bb | 2 +- meta/lib/oe/sstatesig.py | 2 +- 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" MC_DEPLOY_DIR_IMAGE = "${TOPDIR}/tmp-mc-${MCNAME}/deploy/images/${MCMACHINE}" -do_install[mcdepends] += "multiconfig::${MCNAME}:core-image-minimal:do_image_complete multiconfig::${MCNAME}:virtual/kernel:do_deploy" +do_install[mcdepends] += "mc::${MCNAME}:core-image-minimal:do_image_complete mc::${MCNAME}:virtual/kernel:do_deploy" do_install () { 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): else: def get_mc(tid): tid = tid.rsplit('.', 1)[0] - if tid.startswith('multiconfig:'): + if tid.startswith('mc:'): elems = tid.split(':') return elems[1] def recipename_from_dep(dep): -- cgit v1.2.3-54-g00ecf