MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

sanity-meta-virt: Make skip variable name layer specific

Browse Source 
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>
This commit is contained in:
Paul Barker 2017-10-12 16:49:54 +00:00 committed by Bruce Ashfield
parent 89a1121656
commit 1e4530c283
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/sanity-meta-virt.bbclass
View File

@ -1,7 +1,7 @@
addhandler virt_bbappend_distrocheck addhandler virt_bbappend_distrocheck
virt_bbappend_distrocheck[eventmask] = "bb.event.ConfigParsed" virt_bbappend_distrocheck[eventmask] = "bb.event.ConfigParsed"
python virt_bbappend_distrocheck() { 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: if 'virtualization' not in e.data.getVar('DISTRO_FEATURES').split() and not skip_check:
bb.warn("You have included the meta-virtualization layer, but \ bb.warn("You have included the meta-virtualization layer, but \
'virtualization' has not been enabled in your DISTRO_FEATURES. Some bbappend files \ 'virtualization' has not been enabled in your DISTRO_FEATURES. Some bbappend files \

2
conf/layer.conf
View File

@ -24,5 +24,5 @@ PREFERRED_PROVIDER_virtual/runc ?= "runc-docker"
PREFERRED_PROVIDER_virtual/containerd ?= "containerd-docker" PREFERRED_PROVIDER_virtual/containerd ?= "containerd-docker"
# Sanity check for meta-virtualization layer. # 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" INHERIT += "sanity-meta-virt"