From 0e1426d82c5bf39c7b43cdc475f1efedcc67e71c Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Thu, 10 Oct 2013 18:56:32 +0200
Subject: conf: update sample configuration

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

(limited to 'buildconf')

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
@@ -43,12 +43,6 @@ PARALLEL_MAKE = "-j 4"
 MACHINE ??= "qemux86"
 MACHINE ?= "colibri-t20"
 
-#
-# Licenses
-#
-COPY_LIC_MANIFEST = "1"
-COPY_LIC_DIRS = "1"
-
 #
 # Where to place downloads
 #
@@ -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"
-- 
cgit v1.2.3