Update layers, switch to poky repo for convenience

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
kergoth · Oct 9, 2012 · 9275e5c · 9275e5c
1 parent c74b5a6
commit 9275e5c
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 14 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "meta-oe"]
 	path = meta-oe
 	url = git://github.com/openembedded/meta-oe
+[submodule "poky"]
+	path = poky
+	url = git://git.yoctoproject.org/poky.git
diff --git a/bitbake b/bitbake
diff --git a/conf/bblayers.conf b/conf/bblayers.conf
@@ -6,9 +6,11 @@ BBLAYERS = '\
     ${TOPDIR}/meta-fsl-ppc \
     ${TOPDIR}/meta-intel \
     ${TOPDIR}/meta-ti \
-    ${TOPDIR}/meta-yocto \
     ${TOPDIR}/meta-mentor \
-    ${TOPDIR}/oe-core/meta \
+    ${TOPDIR}/poky/meta-yocto \
+    ${TOPDIR}/poky/meta \
     ${TOPDIR}/meta-oe/meta-oe \
 '
-LCONF_VERSION = '5'
+#BBLAYERS =+ '${TOPDIR}/meta-sourcery'
+
+LCONF_VERSION = "6"
diff --git a/meta-fsl-arm b/meta-fsl-arm
diff --git a/meta-fsl-ppc b/meta-fsl-ppc
diff --git a/meta-intel b/meta-intel
diff --git a/meta-mentor b/meta-mentor
diff --git a/meta-oe b/meta-oe
diff --git a/meta-sourcery b/meta-sourcery
diff --git a/meta-ti b/meta-ti
diff --git a/meta-yocto b/meta-yocto
diff --git a/oe-core b/oe-core
diff --git a/poky b/poky
diff --git a/setup.sh b/setup.sh
@@ -1,4 +1,4 @@
-PATH=$PWD/oe-core/scripts:$PWD/bitbake/bin:$PATH
+PATH=$PWD/meta-mentor/scripts:$PWD/poky/scripts:$PWD/poky/bitbake/bin:$PATH
 export PATH
 
 # Used by poky-qemu, scripts/bitbake