aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2017-09-05 17:31:05 -0500
committerMark Hatle <mark.hatle@windriver.com>2017-09-06 15:06:41 -0500
commit6fc0b45de44550d1345f4cb144b93a6e810497e8 (patch)
tree4e39e88fe0143650c7cad2d47f6a2684d7834194
parentfbf6610027bdb4576cd58fc7838659ef511cdb88 (diff)
downloadmeta-openembedded-contrib-6fc0b45de44550d1345f4cb144b93a6e810497e8.tar.gz
meta-openembedded-contrib-6fc0b45de44550d1345f4cb144b93a6e810497e8.tar.bz2
meta-openembedded-contrib-6fc0b45de44550d1345f4cb144b93a6e810497e8.zip
enable_gnome.conf: Move the AVAHI_GTK setting
This is a distribution wide setting, so just including the layer should not affect other layers. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-rw-r--r--meta-gnome/README5
-rw-r--r--meta-gnome/conf/enable_gnome.conf1
-rw-r--r--meta-gnome/conf/layer.conf2
3 files changed, 6 insertions, 2 deletions
diff --git a/meta-gnome/README b/meta-gnome/README
index 0c4fbd2a54..14cf415af5 100644
--- a/meta-gnome/README
+++ b/meta-gnome/README
@@ -1,3 +1,8 @@
+To enable gnome, you need to add the following to your system:
+
+require conf/enable_gnome.conf
+
+
This layer depends on:
URI: git://github.com/openembedded/oe-core.git
diff --git a/meta-gnome/conf/enable_gnome.conf b/meta-gnome/conf/enable_gnome.conf
new file mode 100644
index 0000000000..883a6f5573
--- /dev/null
+++ b/meta-gnome/conf/enable_gnome.conf
@@ -0,0 +1 @@
+AVAHI_GTK_pn-avahi-ui = "gtk gtk3"
diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
index fce5627bd9..58e12a9cda 100644
--- a/meta-gnome/conf/layer.conf
+++ b/meta-gnome/conf/layer.conf
@@ -13,5 +13,3 @@ BBFILE_PRIORITY_gnome-layer = "7"
LAYERVERSION_gnome-layer = "1"
LAYERDEPENDS_gnome-layer = "core openembedded-layer"
-
-AVAHI_GTK_pn-avahi-ui = "gtk gtk3"