[gnome-continuous/wip/yocto1.7: 4/4] Use the new gnomeostree-3.14-dizzy branch

[Alexander Larsson <alexl src gnome org>]

commit 47bb349a86741683f26a5d8cc9623306c3c50c30
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Sep 23 14:55:46 2014 +0200

    Use the new gnomeostree-3.14-dizzy branch
    
    This changes the base yocto reference to the gnomeostree-3.14-dizzy
    branch which is (temporarily) alexlarsson:poky. I expect this to move
    to cgwalters:poky later.
    
    Additionally it does a few poky specific changes:
    * Drop ca-certificates from manifest in favour of the one
      from poky. This fixes a directory name conflict when replacing
      the poky one with the ostree build one. And anywy, the poky one
      is probably better maintained.
    * Change refereces from "tmp-eglibc" to "tmp-glibc" as this got
      directory got renamed in poky (due to switching to glibc).

 manifest.json          |   10 +++-------
 src/ostree-build-yocto |    4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 8833f11..2037c43 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": "alexlarsson:poky",
+            "branch": "gnomeostree-3.14-dizzy"
           },
 
   "config-opts": ["--disable-static", "--disable-silent-rules"],
@@ -41,6 +41,7 @@
                 "ipxe": "git:git://git.ipxe.org/",
                 "socat": "git:git://repo.or.cz/",
                "cgwalters": "git:git://github.com/cgwalters/",
+               "alexlarsson": "git:git://github.com/alexlarsson/",
                 "anholt": "git:git://github.com/anholt/",
                 "fujita": "git:git://github.com/fujita/",
                 "mikechristie" : "git:git://github.com/mikechristie/"},
@@ -598,11 +599,6 @@
 
                {"src": "fd-fprint:fprintd"},
 
-               {"src": "git:git://pkgs.fedoraproject.org/ca-certificates.git",
-                "tag": "8c27f267a89811f60b0cb442f637a01b2978e2c2",
-                 "component": "minimal",
-                "patches": ["ca-certs-build.patch"]},
-
                {"src": "fd-p11:p11-kit",
                  "component": "minimal"},
 
diff --git a/src/ostree-build-yocto b/src/ostree-build-yocto
index c03e6e0..e8d9f90 100644
--- a/src/ostree-build-yocto
+++ b/src/ostree-build-yocto
@@ -85,12 +85,12 @@ EOF
     mv ${localconf}.tmp ${localconf}
 fi
 
-IMAGEDIR=${builddir}/tmp-eglibc/deploy/images
+IMAGEDIR=${builddir}/tmp-glibc/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
+    ln -sf ${builddir}/tmp-glibc/deploy/images/${MACHINE}/gnomeos-contents-${basetype}-${MACHINE}.tar.gz 
gnomeos-contents-${basetype}-${architecture}.tar.gz
 done