[gnome-ostree] ostree-build-yocto: Ensure we point bblayers.conf at our checkout

[Colin Walters <walters src gnome org>]

commit 48994dbdc45b99941fe001b971b382f3497b7652
Author: Colin Walters <walters verbum org>
Date:   Fri Mar 1 18:40:08 2013 -0500

    ostree-build-yocto: Ensure we point bblayers.conf at our checkout
    
    This was broken in the rewrite.

 src/ostree-build-yocto |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/src/ostree-build-yocto b/src/ostree-build-yocto
index 095b04a..8107e78 100644
--- a/src/ostree-build-yocto
+++ b/src/ostree-build-yocto
@@ -40,9 +40,21 @@ test -n "${repo_path}" || (usage; exit 1)
 
 . "${srcdir}/oe-init-build-env" "${builddir}"
 
-if ! grep -q meta-gnomeos ${builddir}/conf/bblayers.conf; then
-    echo "BBLAYERS += \"${srcdir}/meta-gnomeos\"" >> ${builddir}/conf/bblayers.conf
-fi
+cat > ${builddir}/conf/bblayers.conf <<EOF
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "\${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ${srcdir}/meta \
+  ${srcdir}/meta-yocto \
+  ${srcdir}/meta-yocto-bsp \
+  ${srcdir}/meta-gnomeos \
+  "
+EOF
 
 case "$architecture" in
     i686) MACHINE="atom-pc";;