summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildconf/bblayers.conf6
-rw-r--r--buildconf/local.conf11
2 files changed, 8 insertions, 9 deletions
diff --git a/buildconf/bblayers.conf b/buildconf/bblayers.conf
index 8d5972a..a6ac0db 100644
--- a/buildconf/bblayers.conf
+++ b/buildconf/bblayers.conf
@@ -7,6 +7,8 @@ BBFILES ?= ""
# These layers hold recipe metadata not found in OE-core, but lack any machine or distro content
BASELAYERS ?= " \
+ ${TOPDIR}/../stuff/meta-linaro/meta-linaro-toolchain \
+ ${TOPDIR}/../stuff/meta-openembedded/toolchain-layer \
${TOPDIR}/../stuff/meta-openembedded/meta-oe \
${TOPDIR}/../stuff/meta-openembedded/meta-efl \
${TOPDIR}/../stuff/meta-openembedded/meta-gpe \
@@ -14,6 +16,7 @@ BASELAYERS ?= " \
${TOPDIR}/../stuff/meta-openembedded/meta-xfce \
${TOPDIR}/../stuff/meta-openembedded/meta-initramfs \
${TOPDIR}/../stuff/meta-openembedded/meta-systemd \
+ ${TOPDIR}/../stuff/meta-openembedded/meta-networking \
${TOPDIR}/../stuff/meta-openembedded/meta-multimedia \
${TOPDIR}/../stuff/oe-tworaz/meta-lxde \
${TOPDIR}/../stuff/meta-browser \
@@ -21,6 +24,7 @@ BASELAYERS ?= " \
# These layers hold machine specific content, aka Board Support Packages
BSPLAYERS ?= " \
+ ${TOPDIR}/../stuff/meta-fsl-arm \
${TOPDIR}/../stuff/meta-toradex \
"
@@ -29,4 +33,4 @@ BBLAYERS ?= " \
${BSPLAYERS} \
${BASELAYERS}\
${TOPDIR}/../stuff/openembedded-core/meta \
- "
+"
diff --git a/buildconf/local.conf b/buildconf/local.conf
index c82844b..ea6f2a3 100644
--- a/buildconf/local.conf
+++ b/buildconf/local.conf
@@ -44,12 +44,6 @@ MACHINE ??= "qemux86"
MACHINE ?= "colibri-t20"
#
-# Licenses
-#
-COPY_LIC_MANIFEST = "1"
-COPY_LIC_DIRS = "1"
-
-#
# Where to place downloads
#
# During a first build the system will download many different source code tarballs
@@ -213,7 +207,7 @@ CONF_VERSION = "1"
INHERIT += "rm_work"
# Use this distro
-DISTRO = "angstrom-next"
+DISTRO = "angstrom-v2013.06"
# What image type(s) are to be built?
IMAGE_FSTYPES += "tar.bz2"
@@ -225,4 +219,5 @@ IMAGE_FSTYPES += "tar.bz2"
ASSUME_PROVIDED += "svn-native mercurial-native"
#ASSUME_PROVIDED += "git-native svn-native mercurial-native"
-PREFERRED_PROVIDER_psplash-support = "psplash-angstrom" \ No newline at end of file
+PREFERRED_PROVIDER_psplash-support = "psplash-angstrom"
+PREFERRED_PROVIDER_eglibc = "eglibc"