From b86532e03bf534caf827088b75c34aa6aec12938 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Fri, 5 Oct 2012 17:51:50 +0200
Subject: config changes due to oe-core update

---
 buildconf/bblayers.conf | 6 ++++--
 buildconf/local.conf    | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'buildconf')

diff --git a/buildconf/bblayers.conf b/buildconf/bblayers.conf
index 60329ee..8d5972a 100644
--- a/buildconf/bblayers.conf
+++ b/buildconf/bblayers.conf
@@ -1,7 +1,8 @@
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "4"
+LCONF_VERSION = "5"
 
+BBPATH = "${TOPDIR}"
 BBFILES ?= ""
 
 # These layers hold recipe metadata not found in OE-core, but lack any machine or distro content
@@ -12,6 +13,8 @@ BASELAYERS ?= " \
   ${TOPDIR}/../stuff/meta-openembedded/meta-gnome \
   ${TOPDIR}/../stuff/meta-openembedded/meta-xfce \
   ${TOPDIR}/../stuff/meta-openembedded/meta-initramfs \
+  ${TOPDIR}/../stuff/meta-openembedded/meta-systemd \
+  ${TOPDIR}/../stuff/meta-openembedded/meta-multimedia \
   ${TOPDIR}/../stuff/oe-tworaz/meta-lxde \
   ${TOPDIR}/../stuff/meta-browser \
 " 
@@ -21,7 +24,6 @@ BSPLAYERS ?= " \
   ${TOPDIR}/../stuff/meta-toradex \
 "
 
-
 BBLAYERS ?= " \
   ${TOPDIR}/../stuff/meta-angstrom \
   ${BSPLAYERS} \
diff --git a/buildconf/local.conf b/buildconf/local.conf
index 91b7ccb..7696f97 100644
--- a/buildconf/local.conf
+++ b/buildconf/local.conf
@@ -54,7 +54,7 @@ MACHINE ?= "colibri-t20"
 #
 # The default is a downloads directory under TOPDIR which is the build directory.
 #
-#DL_DIR ?= "${home}/oe/sources"
+DL_DIR ?= "${HOME}/oe-core/build/downloads"
 
 #
 # Where to place shared-state files
@@ -207,7 +207,7 @@ CONF_VERSION = "1"
 INHERIT += "rm_work"
 
 # Use this distro
-DISTRO = "angstrom-v2012.x"
+DISTRO = "angstrom-next"
 
 # What image type(s) are to be built?
 IMAGE_FSTYPES += "tar.bz2"
-- 
cgit v1.2.3