summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <pbarker@toganlabs.com>2017-10-12 16:49:54 +0000
committerBruce Ashfield <bruce.ashfield@windriver.com>2017-10-12 21:59:51 -0400
commit1e4530c283015d0874765b7dd69c55b843b9bee2 (patch)
tree65a0ae19f3fa831123b5a33107218802ae113b04
parent89a1121656aaf04966b79756c6967f7a5ada02d5 (diff)
downloadmeta-virtualization-1e4530c283015d0874765b7dd69c55b843b9bee2.tar.gz
sanity-meta-virt: Make skip variable name layer specific
The variable used to skip the sanity check should be named in a layer specific way. This will ensure there is no confusion if other layers use a similar sanity check. Signed-off-by: Paul Barker <pbarker@toganlabs.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--classes/sanity-meta-virt.bbclass2
-rw-r--r--conf/layer.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/sanity-meta-virt.bbclass b/classes/sanity-meta-virt.bbclass
index bd2b7172..417ab6ff 100644
--- a/classes/sanity-meta-virt.bbclass
+++ b/classes/sanity-meta-virt.bbclass
@@ -1,7 +1,7 @@
1addhandler virt_bbappend_distrocheck 1addhandler virt_bbappend_distrocheck
2virt_bbappend_distrocheck[eventmask] = "bb.event.ConfigParsed" 2virt_bbappend_distrocheck[eventmask] = "bb.event.ConfigParsed"
3python virt_bbappend_distrocheck() { 3python virt_bbappend_distrocheck() {
4 skip_check = e.data.getVar('SKIP_SANITY_BBAPPEND_CHECK') == "1" 4 skip_check = e.data.getVar('SKIP_META_VIRT_SANITY_CHECK') == "1"
5 if 'virtualization' not in e.data.getVar('DISTRO_FEATURES').split() and not skip_check: 5 if 'virtualization' not in e.data.getVar('DISTRO_FEATURES').split() and not skip_check:
6 bb.warn("You have included the meta-virtualization layer, but \ 6 bb.warn("You have included the meta-virtualization layer, but \
7'virtualization' has not been enabled in your DISTRO_FEATURES. Some bbappend files \ 7'virtualization' has not been enabled in your DISTRO_FEATURES. Some bbappend files \
diff --git a/conf/layer.conf b/conf/layer.conf
index 51ca8ee2..f71c117d 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -24,5 +24,5 @@ PREFERRED_PROVIDER_virtual/runc ?= "runc-docker"
24PREFERRED_PROVIDER_virtual/containerd ?= "containerd-docker" 24PREFERRED_PROVIDER_virtual/containerd ?= "containerd-docker"
25 25
26# Sanity check for meta-virtualization layer. 26# Sanity check for meta-virtualization layer.
27# Setting SKIP_SANITY_BBAPPEND_CHECK to "1" would skip the bbappend files check. 27# Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check.
28INHERIT += "sanity-meta-virt" 28INHERIT += "sanity-meta-virt"