[gnome-continuous/wip/yocto1.6: 1/7] Revert "Revert "Update build procedure for yocto 1.6""

[Vadim Rutkovsky <vrutkovsky src gnome org>]

commit dc0de0e4dcdb4b5be367a21a1270d31189d42c62
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Mon May 19 16:39:52 2014 +0200

    Revert "Revert "Update build procedure for yocto 1.6""
    
    This reverts commit a575b2be8d5f4e8777d5d77ffc3346c1e8f3df51.

 manifest.json          |   21 +++++++++------------
 src/ostree-build-yocto |    4 ++--
 2 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 316f185..de8032e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,8 +6,8 @@
   "architectures": ["x86_64"],
   "base": {
             "name": "yocto",
-           "src": "cgwalters:poky",
-            "branch": "gnomeostree-3.10-dylan"
+           "src": "vrutkovs:poky",
+            "branch": "gnomeostree-3.14-daisy"
           },
 
   "config-opts": ["--disable-static", "--disable-silent-rules"],
@@ -35,6 +35,7 @@
                 "debian": "git:git://anonscm.debian.org/",
                "netfilter": "git:git://git.netfilter.org/",
                "cgwalters": "git:git://github.com/cgwalters/",
+               "vrutkovs": "git:git://github.com/vrutkovs/",
                 "anholt": "git:git://github.com/anholt/"},
 
   "patches": {"src": "gnome:gnome-continuous",
@@ -91,15 +92,14 @@
                 "config-opts": ["--enable-vapigen"]},
 
                {"src": "git:git://anongit.freedesktop.org/systemd/systemd",
-                "tag": "c9ccc19f9eb0599109094c57b7a2f668d708f0c1",
-                "tag-reason": "Depends on gcc 4.8",
+                "tag": "v212",
                 "initramfs-depends": true,
                 "config-opts": ["--disable-manpages",
                                 "--disable-networkd",
                                 "--with-sysvinit-path=",
                                 "--with-sysvrcnd-path="]},
 
-               {"src": "git:git://sourceware.org/git/lvm2.git"},
+               {"src": "git:git://git.fedorahosted.org/git/lvm2.git"},
 
                {"src": "gnome:linux-user-chroot",
                 "setuid": ["/runtime/usr/bin/linux-user-chroot"]},
@@ -113,7 +113,7 @@
                {"src": "fd:pixman"},
 
                {"src": "git:git://git.sv.nongnu.org/freetype/freetype2.git",
-                "tag": "VER-2-4-8",
+                "tag": "VER-2-5-3",
                 "patches": ["freetype-autogen.patch"]},
 
                {"src": "fd:fontconfig",
@@ -295,7 +295,6 @@
                 {"src": "git:http://bitmath.org/git/mtdev.git"},
 
         {"src": "fd:libevdev",
-         "tag": "cf70d0cd88241cbbcc5f785f21d9eb66518cb45c",
                 "config-opts": ["--disable-gcov"]},
 
                {"src": "fd:wayland/libinput"},
@@ -1136,9 +1135,7 @@
 
     "initramfs-build-epoch": {"version": 0},
     
-       "build-epoch": {"version": 51,
-                       "all": false,
-                       "component-names": [
-                    "xorg-driver-xf86-video-modesetting",
-                    "xorg-driver-xf86-video-qxl", "xorg-driver-xf86-video-vesa"]}
+       "build-epoch": {"version": 52,
+                       "all": true,
+                       "component-names": []}
 }
diff --git a/src/ostree-build-yocto b/src/ostree-build-yocto
index c03e6e0..5dcafe9 100644
--- a/src/ostree-build-yocto
+++ b/src/ostree-build-yocto
@@ -89,8 +89,8 @@ IMAGEDIR=${builddir}/tmp-eglibc/deploy/images
 mkdir -p "${IMAGEDIR}"
 ln -sf ${repo_path} ${IMAGEDIR}/repo
 
-bitbake gnomeos-contents-{runtime,devel}
 
 for basetype in runtime devel; do
-    ln -sf ${builddir}/tmp-eglibc/deploy/images/gnomeos-contents-${basetype}-${MACHINE}.tar.gz 
gnomeos-contents-${basetype}-${architecture}.tar.gz
+    bitbake gnomeos-contents-${basetype}
+    ln -sf ${builddir}/tmp-eglibc/deploy/images/${MACHINE}/gnomeos-contents-${basetype}-${MACHINE}.tar.gz 
gnomeos-contents-${basetype}-${architecture}.tar.gz
 done