summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildconf/bblayers.conf9
-rw-r--r--buildconf/local.conf5
2 files changed, 9 insertions, 5 deletions
diff --git a/buildconf/bblayers.conf b/buildconf/bblayers.conf
index 63c8539..74969e4 100644
--- a/buildconf/bblayers.conf
+++ b/buildconf/bblayers.conf
@@ -1,6 +1,6 @@
# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
# changes incompatibly
-LCONF_VERSION = "6"
+LCONF_VERSION = "7"
BBPATH = "${TOPDIR}"
BBFILES ?= ""
@@ -10,8 +10,8 @@ BBLAYERS ?= " \
\
\
${TOPDIR}/../layers/meta-toradex-nxp \
- ${TOPDIR}/../layers/meta-fsl-arm \
- ${TOPDIR}/../layers/meta-fsl-arm-extra \
+ ${TOPDIR}/../layers/meta-freescale \
+ ${TOPDIR}/../layers/meta-freescale-3rdparty \
\
${TOPDIR}/../layers/meta-toradex-tegra \
${TOPDIR}/../layers/meta-jetson-tk1 \
@@ -32,8 +32,9 @@ BBLAYERS ?= " \
${TOPDIR}/../layers/meta-openembedded/meta-python \
${TOPDIR}/../layers/meta-lxde \
${TOPDIR}/../layers/meta-browser \
+ ${TOPDIR}/../layers/meta-qt4 \
${TOPDIR}/../layers/meta-qt5 \
- ${TOPDIR}/../layers/meta-fsl-demos \
+ ${TOPDIR}/../layers/meta-freescale-distro \
${TOPDIR}/../layers/meta-toradex-demos \
\
\
diff --git a/buildconf/local.conf b/buildconf/local.conf
index 6951570..a0bae2d 100644
--- a/buildconf/local.conf
+++ b/buildconf/local.conf
@@ -1,5 +1,8 @@
WARN_QA_remove = "host-user-contaminated"
+# meta-freescale otherwise defaults to wayland
+DISTRO_FEATURES_remove = "wayland"
+
# This file is your local configuration file and is where all local user settings
# are placed. The comments in this file give some guide to the options a new user
# to the system might want to change but pretty much any configuration option can
@@ -259,7 +262,7 @@ INHERIT += "rm_work"
INHERIT += "toradex-mirrors"
# Use this distro (filename from meta-angstrom/conf/distro/xx.conf)
-DISTRO = "angstrom-v2015.12"
+DISTRO = "angstrom"
# What image type(s) are to be built?
IMAGE_FSTYPES += "tar.bz2"