diff options
-rw-r--r-- | classes/sanity-meta-virt.bbclass | 2 | ||||
-rw-r--r-- | 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 bd2b7172..417ab6ff 100644 --- a/classes/sanity-meta-virt.bbclass +++ b/classes/sanity-meta-virt.bbclass | |||
@@ -1,7 +1,7 @@ | |||
1 | addhandler virt_bbappend_distrocheck | 1 | addhandler virt_bbappend_distrocheck |
2 | virt_bbappend_distrocheck[eventmask] = "bb.event.ConfigParsed" | 2 | virt_bbappend_distrocheck[eventmask] = "bb.event.ConfigParsed" |
3 | python virt_bbappend_distrocheck() { | 3 | python 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" | |||
24 | PREFERRED_PROVIDER_virtual/containerd ?= "containerd-docker" | 24 | PREFERRED_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. |
28 | INHERIT += "sanity-meta-virt" | 28 | INHERIT += "sanity-meta-virt" |