[gnome-ostree] build-yocto: Explicitly set LAYER_CONF_VERSION and CONF_VERSION

[Colin Walters <walters src gnome org>]

commit 3b46a28fade3223ce8d0629e313ee7869ae11809
Author: Colin Walters <walters verbum org>
Date:   Mon Nov 5 20:11:28 2012 -0500

    build-yocto: Explicitly set LAYER_CONF_VERSION and CONF_VERSION
    
    We need the first for some unknown reason.
    
    The latter appears to be some sort of weird way to force you to ensure
    your copy of the configuration defaults are up to date.

 src/ostbuild/ostree-build-yocto |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/src/ostbuild/ostree-build-yocto b/src/ostbuild/ostree-build-yocto
index afb86b5..80f01e1 100644
--- a/src/ostbuild/ostree-build-yocto
+++ b/src/ostbuild/ostree-build-yocto
@@ -59,14 +59,23 @@ if ! grep -q meta-gnomeos ${builddir}/conf/bblayers.conf; then
     echo "BBLAYERS += \"${srcdir}/meta-gnomeos\"" >> ${builddir}/conf/bblayers.conf
 fi
 
-if ! grep -q "DISTRO.*gnomeosdistro" ${builddir}/conf/local.conf; then
+mkdir -p ${builddir}/conf
+localconf=${builddir}/conf/local.conf
+if ! grep -q "DISTRO.*gnomeos" ${localconf}; then
     numcpus=$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 ))
-    cat >> ${builddir}/conf/local.conf <<EOF
+    cat > ${localconf}.tmp <<EOF
 PARALLEL_MAKE = "-j ${numcpus}"
 BB_NUMBER_THREADS = "${numcpus}"
+LAYER_CONF_VERSION = "6"
+CONF_VERSION = "1"
+MACHINE = "qemux86"
 DISTRO = "gnomeosdistro"
+USER_CLASSES = ""
+PACKAGE_CLASSES = "package_rpm"
+PATCHRESOLVE = "noop"
 INHERIT += "rm_work"
 EOF
+    mv ${localconf}.tmp ${localconf}
 fi
 
 IMAGEDIR=${builddir}/tmp-eglibc/deploy/images