aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-03-07 07:15:59 -0800
committerArmin Kuster <akuster808@gmail.com>2018-03-12 09:59:34 -0700
commit05dc31e5461e6a8791bdc0f93ec56d07e08d19e9 (patch)
tree20f5be01707812b96dbaaf0e7037f902218eaf46
parentcf50e1f47d9d4329406c7c8cb8c1cbe9e310367f (diff)
downloadmeta-openembedded-05dc31e5461e6a8791bdc0f93ec56d07e08d19e9.tar.gz
santiy-meta-gnome: add class for bbappend files checking
Idea taken from meta-virt Add a new class, sanity-meta-gnome.bbclass, to check for whether necessary settings are available for bbappend files in this layer to be effective, and warn users if not. In addition, a variable SKIP_SANITY_BBAPPEND_CHECK is added to enable users to explicitly skip the checking to avoid unwanted warnings. Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-gnome/README23
-rw-r--r--meta-gnome/classes/sanity-meta-gnome.bbclass10
-rw-r--r--meta-gnome/conf/layer.conf4
3 files changed, 37 insertions, 0 deletions
diff --git a/meta-gnome/README b/meta-gnome/README
index 0c4fbd2a54..482f4570bd 100644
--- a/meta-gnome/README
+++ b/meta-gnome/README
@@ -1,3 +1,25 @@
+meta-gnome
+===========
+
+The recipe in this layer needs to have 'x11' in DISTRO_FEATURES
+to have effect. To enable them, add in configuration file the following line.
+
+ DISTRO_FEATURES_append = " x11"
+
+If meta-gnome is included, but x11 is not enabled as a
+distro feature a warning is printed at parse time:
+
+ You have included the meta-gnome layer, but
+ 'x11' has not been enabled in your DISTRO_FEATURES.
+
+If you know what you are doing, this warning can be disabled by setting the following
+variable in your configuration:
+
+ SKIP_META_GNOME_SANITY_CHECK = 1
+
+
+Dependencies
+------------
This layer depends on:
URI: git://github.com/openembedded/oe-core.git
@@ -14,3 +36,4 @@ When sending single patches, please using something like:
'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][PATCH'
Interim layer maintainer: Martin Jansa <Martin.Jansa@gmail.com>
+
diff --git a/meta-gnome/classes/sanity-meta-gnome.bbclass b/meta-gnome/classes/sanity-meta-gnome.bbclass
new file mode 100644
index 0000000000..331ea193d9
--- /dev/null
+++ b/meta-gnome/classes/sanity-meta-gnome.bbclass
@@ -0,0 +1,10 @@
+addhandler gnome_bbappend_distrocheck
+gnome_bbappend_distrocheck[eventmask] = "bb.event.SanityCheck"
+python gnome_bbappend_distrocheck() {
+ skip_check = e.data.getVar('SKIP_META_GNOME_SANITY_CHECK') == "1"
+ if 'x11' not in e.data.getVar('DISTRO_FEATURES').split() and not skip_check:
+ bb.warn("You have included the meta-gnome layer, but \
+'x11' has not been enabled in your DISTRO_FEATURES. Some bbappend files \
+may not take effect. See the meta-gnome README for details on enabling \
+meta-gnome support.")
+}
diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
index fb89c147c3..37215a7708 100644
--- a/meta-gnome/conf/layer.conf
+++ b/meta-gnome/conf/layer.conf
@@ -13,3 +13,7 @@ BBFILE_PRIORITY_gnome-layer = "7"
LAYERVERSION_gnome-layer = "1"
LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer"
+
+# Sanity check for meta-gnome layer.
+# Setting SKIP_META_GNOME_SANITY_CHECK to "1" would skip the bbappend files check.
+INHERIT += "sanity-meta-gnome"