From 68e89e60ebc07146ec063d423f77065c9e219692 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Mon, 24 Jun 2019 10:33:37 +0300 Subject: sanity-meta-gnome: Remove obsolete class There are no bbappend left in meta-gnome. Individual recipes that require x11 already provide a proper error for that. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- meta-gnome/README | 20 -------------------- meta-gnome/classes/sanity-meta-gnome.bbclass | 10 ---------- meta-gnome/conf/layer.conf | 4 ---- 3 files changed, 34 deletions(-) delete mode 100644 meta-gnome/classes/sanity-meta-gnome.bbclass (limited to 'meta-gnome') diff --git a/meta-gnome/README b/meta-gnome/README index 2a682e72d3..3c5b4c5f9d 100644 --- a/meta-gnome/README +++ b/meta-gnome/README @@ -1,23 +1,3 @@ -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: diff --git a/meta-gnome/classes/sanity-meta-gnome.bbclass b/meta-gnome/classes/sanity-meta-gnome.bbclass deleted file mode 100644 index 331ea193d9..0000000000 --- a/meta-gnome/classes/sanity-meta-gnome.bbclass +++ /dev/null @@ -1,10 +0,0 @@ -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 0b68232de7..9ed1421981 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -15,7 +15,3 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" LAYERSERIES_COMPAT_gnome-layer = "thud warrior" - -# Sanity check for meta-gnome layer. -# Setting SKIP_META_GNOME_SANITY_CHECK to "1" would skip the bbappend files check. -INHERIT += "sanity-meta-gnome" -- cgit 1.2.3-korg