diff options
| author | Armin Kuster <akuster808@gmail.com> | 2018-03-07 07:15:59 -0800 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-03-12 09:59:34 -0700 |
| commit | 05dc31e5461e6a8791bdc0f93ec56d07e08d19e9 (patch) | |
| tree | 20f5be01707812b96dbaaf0e7037f902218eaf46 | |
| parent | cf50e1f47d9d4329406c7c8cb8c1cbe9e310367f (diff) | |
| download | meta-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/README | 23 | ||||
| -rw-r--r-- | meta-gnome/classes/sanity-meta-gnome.bbclass | 10 | ||||
| -rw-r--r-- | meta-gnome/conf/layer.conf | 4 |
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 @@ | |||
| 1 | meta-gnome | ||
| 2 | =========== | ||
| 3 | |||
| 4 | The recipe in this layer needs to have 'x11' in DISTRO_FEATURES | ||
| 5 | to have effect. To enable them, add in configuration file the following line. | ||
| 6 | |||
| 7 | DISTRO_FEATURES_append = " x11" | ||
| 8 | |||
| 9 | If meta-gnome is included, but x11 is not enabled as a | ||
| 10 | distro feature a warning is printed at parse time: | ||
| 11 | |||
| 12 | You have included the meta-gnome layer, but | ||
| 13 | 'x11' has not been enabled in your DISTRO_FEATURES. | ||
| 14 | |||
| 15 | If you know what you are doing, this warning can be disabled by setting the following | ||
| 16 | variable in your configuration: | ||
| 17 | |||
| 18 | SKIP_META_GNOME_SANITY_CHECK = 1 | ||
| 19 | |||
| 20 | |||
| 21 | Dependencies | ||
| 22 | ------------ | ||
| 1 | This layer depends on: | 23 | This layer depends on: |
| 2 | 24 | ||
| 3 | URI: git://github.com/openembedded/oe-core.git | 25 | URI: git://github.com/openembedded/oe-core.git |
| @@ -14,3 +36,4 @@ When sending single patches, please using something like: | |||
| 14 | 'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][PATCH' | 36 | 'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][PATCH' |
| 15 | 37 | ||
| 16 | Interim layer maintainer: Martin Jansa <Martin.Jansa@gmail.com> | 38 | Interim layer maintainer: Martin Jansa <Martin.Jansa@gmail.com> |
| 39 | |||
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 @@ | |||
| 1 | addhandler gnome_bbappend_distrocheck | ||
| 2 | gnome_bbappend_distrocheck[eventmask] = "bb.event.SanityCheck" | ||
| 3 | python gnome_bbappend_distrocheck() { | ||
| 4 | skip_check = e.data.getVar('SKIP_META_GNOME_SANITY_CHECK') == "1" | ||
| 5 | if 'x11' not in e.data.getVar('DISTRO_FEATURES').split() and not skip_check: | ||
| 6 | bb.warn("You have included the meta-gnome layer, but \ | ||
| 7 | 'x11' has not been enabled in your DISTRO_FEATURES. Some bbappend files \ | ||
| 8 | may not take effect. See the meta-gnome README for details on enabling \ | ||
| 9 | meta-gnome support.") | ||
| 10 | } | ||
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" | |||
| 13 | LAYERVERSION_gnome-layer = "1" | 13 | LAYERVERSION_gnome-layer = "1" |
| 14 | 14 | ||
| 15 | LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" | 15 | LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" |
| 16 | |||
| 17 | # Sanity check for meta-gnome layer. | ||
| 18 | # Setting SKIP_META_GNOME_SANITY_CHECK to "1" would skip the bbappend files check. | ||
| 19 | INHERIT += "sanity-meta-gnome" | ||
