From 456ca08e6dae286481c792a173efd09d8e9580ed Mon Sep 17 00:00:00 2001
From: Jesse Gilles <jgilles@multitech.com>
Date: Tue, 31 Jan 2012 13:43:00 -0600
Subject: add meta-java to bblayers and adjust layer priorities

---
 conf/bblayers.conf                | 4 ++--
 multitech/conf/layer.conf         | 2 +-
 multitech/contrib/user-layer.conf | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/bblayers.conf b/conf/bblayers.conf
index d32d034..9ca9b0a 100644
--- a/conf/bblayers.conf
+++ b/conf/bblayers.conf
@@ -1,4 +1,4 @@
-LCONF_VERSION = "1"
+LCONF_VERSION = "2"
 BBFILES ?= ""
 BBPATH = "${OETREE}"
-BBLAYERS = "${OETREE}/openembedded ${OETREE}/multitech ${OETREE}/user-layer"
+BBLAYERS = "${OETREE}/openembedded ${OETREE}/meta-java ${OETREE}/multitech ${OETREE}/user-layer"
diff --git a/multitech/conf/layer.conf b/multitech/conf/layer.conf
index e1769b4..3502649 100644
--- a/multitech/conf/layer.conf
+++ b/multitech/conf/layer.conf
@@ -1,7 +1,7 @@
 BBFILES += "${LAYERDIR}/recipes/*/*.bb ${LAYERDIR}/recipes/*/*.bbappend"
 BBPATH .= ":${LAYERDIR}"
 BBFILE_COLLECTIONS += "multitech"
-BBFILE_PRIORITY_multitech = "5"
+BBFILE_PRIORITY_multitech = "20"
 BBFILE_PATTERN_multitech = "${LAYERDIR}"
 
 # enable use of THISDIR variable bbappend files (pulled from oe-core)
diff --git a/multitech/contrib/user-layer.conf b/multitech/contrib/user-layer.conf
index 5ca83e6..9af79ee 100644
--- a/multitech/contrib/user-layer.conf
+++ b/multitech/contrib/user-layer.conf
@@ -1,5 +1,5 @@
 BBFILES += "${LAYERDIR}/recipes/*/*.bb ${LAYERDIR}/recipes/*/*.bbappend"
 BBPATH .= ":${LAYERDIR}"
 BBFILE_COLLECTIONS += "user"
-BBFILE_PRIORITY_user = "10"
+BBFILE_PRIORITY_user = "90"
 BBFILE_PATTERN_user = "${LAYERDIR}"
-- 
cgit v1.2.3