[ostree] gnomeos: Pull in libgcrypt, use ostree-init from git

[Colin Walters <walters src gnome org>]

commit d358c5d681458414a7ef288cb445a12a1243816a
Author: Colin Walters <walters verbum org>
Date:   Mon Jan 16 20:18:54 2012 -0500

    gnomeos: Pull in libgcrypt, use ostree-init from git

 gnomeos/yocto/classes/gnomeos-contents.bbclass     |    4 +++-
 .../recipies-core/images/gnomeos-contents-devel.bb |    8 ++++++++
 .../recipies-core/initscripts/initscripts-1.0/dbus |    1 +
 .../yocto/recipies-core/ostree-init/ostree-init.bb |    8 --------
 4 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/gnomeos/yocto/classes/gnomeos-contents.bbclass b/gnomeos/yocto/classes/gnomeos-contents.bbclass
index 795e1a8..64f4d5f 100644
--- a/gnomeos/yocto/classes/gnomeos-contents.bbclass
+++ b/gnomeos/yocto/classes/gnomeos-contents.bbclass
@@ -16,11 +16,13 @@ IMAGE_INSTALL = "libuuid1 \
 		 libogg0 \
 		 speex \
 		 libvorbis \
+                 libstdc++6 \
+                 libgnutls26 \
 		 "
 
 RECIPE_PACKAGES = "task-core-boot \
 		   coreutils \
-		   ostree ostree-init \
+		   ostree \
 		   strace \
 		   bash \
 		   tar \
diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
index 8d3aad4..7cd8573 100644
--- a/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
+++ b/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
@@ -26,4 +26,12 @@ IMAGE_INSTALL += "libuuid-dev \
 		  libogg-dev \
 		  speex-dev \
 		  libvorbis-dev \
+		  libstdc++-dev \
+		  libcap-dev \
+		  libcap-bin \
+		  libgpg-error-dev \
+		  libtasn1-dev \
+		  libtasn1-bin \
+		  libgcrypt-dev \
+		  libgnutls-dev \
 		  "
diff --git a/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus
index 0b3a9dc..67d0d82 100644
--- a/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus
+++ b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus
@@ -3,6 +3,7 @@
 start()
 {
 	echo -n "Starting dbus daemon: "
+	mkdir -p /var/run/dbus
 	/usr/bin/dbus-daemon --system
 }