[meta-virtualization] [PATCH 1/4] sanity-meta-virt: Make skip variable name layer specific

Paul Barker pbarker at toganlabs.com
Thu Oct 12 09:49:54 PDT 2017


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 at toganlabs.com>
---
 classes/sanity-meta-virt.bbclass | 2 +-
 conf/layer.conf                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/sanity-meta-virt.bbclass b/classes/sanity-meta-virt.bbclass
index bd2b717..417ab6f 100644
--- a/classes/sanity-meta-virt.bbclass
+++ b/classes/sanity-meta-virt.bbclass
@@ -1,7 +1,7 @@
 addhandler virt_bbappend_distrocheck
 virt_bbappend_distrocheck[eventmask] = "bb.event.ConfigParsed"
 python virt_bbappend_distrocheck() {
-    skip_check = e.data.getVar('SKIP_SANITY_BBAPPEND_CHECK') == "1"
+    skip_check = e.data.getVar('SKIP_META_VIRT_SANITY_CHECK') == "1"
     if 'virtualization' not in e.data.getVar('DISTRO_FEATURES').split() and not skip_check:
         bb.warn("You have included the meta-virtualization layer, but \
 'virtualization' has not been enabled in your DISTRO_FEATURES. Some bbappend files \
diff --git a/conf/layer.conf b/conf/layer.conf
index 51ca8ee..f71c117 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -24,5 +24,5 @@ PREFERRED_PROVIDER_virtual/runc ?= "runc-docker"
 PREFERRED_PROVIDER_virtual/containerd ?= "containerd-docker"
 
 # Sanity check for meta-virtualization layer.
-# Setting SKIP_SANITY_BBAPPEND_CHECK to "1" would skip the bbappend files check.
+# Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check.
 INHERIT += "sanity-meta-virt"
-- 
2.7.4



More information about the meta-virtualization mailing list