summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2010-09-12 15:02:26 -0700
committerSaul Wold <Saul.Wold@intel.com>2010-09-17 11:32:00 -0700
commit87cac1db8c25a472d796e782bf3b046569cea0dc (patch)
treec4b815009a0b5623fbb463f08c3ee80edb75211b
parent0be92981b32a595e7f48d6589d0e7d73c00ede98 (diff)
downloadpoky-87cac1db8c25a472d796e782bf3b046569cea0dc.tar.gz
bblayers.conf.sample: remove meta-moblin from default layers
This fixes [BUGID #273] Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-rw-r--r--meta/conf/bblayers.conf.sample3
-rw-r--r--meta/conf/sanity.conf2
2 files changed, 2 insertions, 3 deletions
diff --git a/meta/conf/bblayers.conf.sample b/meta/conf/bblayers.conf.sample
index d361f244d9..3c7b6e6f7e 100644
--- a/meta/conf/bblayers.conf.sample
+++ b/meta/conf/bblayers.conf.sample
@@ -1,10 +1,9 @@
1# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 1# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
2# changes incompatibly 2# changes incompatibly
3LCONF_VERSION = "2" 3LCONF_VERSION = "3"
4 4
5BBFILES ?= "" 5BBFILES ?= ""
6BBLAYERS = " \ 6BBLAYERS = " \
7 ##POKYBASE##/meta \ 7 ##POKYBASE##/meta \
8 ##POKYBASE##/meta-moblin \
9 ##POKYBASE##/meta-emenlow \ 8 ##POKYBASE##/meta-emenlow \
10 " 9 "
diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf
index 8c3e54129d..eab7619022 100644
--- a/meta/conf/sanity.conf
+++ b/meta/conf/sanity.conf
@@ -8,7 +8,7 @@ BB_MIN_VERSION = "1.8.10"
8SANITY_ABIFILE = "${TMPDIR}/abi_version" 8SANITY_ABIFILE = "${TMPDIR}/abi_version"
9 9
10POKY_CONF_VERSION = "1" 10POKY_CONF_VERSION = "1"
11LAYER_CONF_VERSION = "2" 11LAYER_CONF_VERSION = "3"
12SITE_CONF_VERSION = "1" 12SITE_CONF_VERSION = "1"
13 13
14INHERIT += "sanity" 14INHERIT += "sanity"