diff options
-rw-r--r-- | meta-gnome/README | 20 | ||||
-rw-r--r-- | meta-gnome/classes/sanity-meta-gnome.bbclass | 10 | ||||
-rw-r--r-- | meta-gnome/conf/layer.conf | 4 |
3 files changed, 0 insertions, 34 deletions
diff --git a/meta-gnome/README b/meta-gnome/README index 2a682e72d..3c5b4c5f9 100644 --- a/meta-gnome/README +++ b/meta-gnome/README | |||
@@ -1,23 +1,3 @@ | |||
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 | 1 | Dependencies |
22 | ------------ | 2 | ------------ |
23 | This layer depends on: | 3 | This layer depends on: |
diff --git a/meta-gnome/classes/sanity-meta-gnome.bbclass b/meta-gnome/classes/sanity-meta-gnome.bbclass deleted file mode 100644 index 331ea193d..000000000 --- a/meta-gnome/classes/sanity-meta-gnome.bbclass +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
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 0b68232de..9ed142198 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf | |||
@@ -15,7 +15,3 @@ LAYERVERSION_gnome-layer = "1" | |||
15 | LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" | 15 | LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" |
16 | 16 | ||
17 | LAYERSERIES_COMPAT_gnome-layer = "thud warrior" | 17 | LAYERSERIES_COMPAT_gnome-layer = "thud warrior" |
18 | |||
19 | # Sanity check for meta-gnome layer. | ||
20 | # Setting SKIP_META_GNOME_SANITY_CHECK to "1" would skip the bbappend files check. | ||
21 | INHERIT += "sanity-meta-gnome" | ||