summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2012-10-05 17:51:50 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2012-10-18 20:32:58 +0200
commitb86532e03bf534caf827088b75c34aa6aec12938 (patch)
treed334f914a5e1bcfd8cd0739763fd5f0b022e81eb
parentca762a9cbc875758652511970d0225d408be6ee3 (diff)
config changes due to oe-core update
-rw-r--r--buildconf/bblayers.conf6
-rw-r--r--buildconf/local.conf4
2 files changed, 6 insertions, 4 deletions
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"