2 files changed, 5 insertions, 10 deletions

diff --git a/build/conf/bblayers.conf.sample b/build/conf/bblayers.conf.sample
new file mode 100644
index 0000000000..3ea6eda66a
--- /dev/null
+++ b/build/conf/bblayers.conf.sample
@@ -0,0 +1,5 @@
+BBFILES ?= ""
+BBLAYERS = " \
+  ${OEROOT}/meta \
+  ${OEROOT}/meta-moblin \
+  "
diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample
index e195b33b88..959a3b9a3e 100644
--- a/build/conf/local.conf.sample
+++ b/build/conf/local.conf.sample
@@ -2,16 +2,6 @@
 DL_DIR ?= "${OEROOT}/sources"
 # Where to cache Poky's built staging output
 PSTAGE_DIR ?= "${OEROOT}/pstage"
-BBFILES += "\
-    ${OEROOT}/meta/packages/*/*.bb \
-    ${OEROOT}/meta-moblin/packages/*/*.bb"
-
-BBFILE_COLLECTIONS = "normal moblin"
-BBFILE_PATTERN_normal = "^${OEROOT}/meta/"
-BBFILE_PATTERN_moblin = "^${OEROOT}/meta-moblin/"
-
-BBFILE_PRIORITY_normal = "5"
-BBFILE_PRIORITY_moblin = "5"
 
 # Uncomment and set to allow bitbake to execute multiple tasks at once.
 # For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would