From f84d0db9a13c9390a6245e2e78114e89856b0023 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 9 Jan 2012 19:56:59 -0500
Subject: [PATCH] gnomeos: Pull in libuuid and libblkid from util-linux

---
 gnomeos/yocto/classes/gnomeos-contents.bbclass           | 9 +++++++--
 .../yocto/recipies-core/images/gnomeos-contents-devel.bb | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gnomeos/yocto/classes/gnomeos-contents.bbclass b/gnomeos/yocto/classes/gnomeos-contents.bbclass
index 58366566..133a2c89 100644
--- a/gnomeos/yocto/classes/gnomeos-contents.bbclass
+++ b/gnomeos/yocto/classes/gnomeos-contents.bbclass
@@ -7,18 +7,23 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit rootfs_${IMAGE_PKGTYPE}
 
-PACKAGE_INSTALL = "task-core-boot \
+IMAGE_INSTALL = ""
+
+RECIPE_PACKAGES = "task-core-boot \
 		   coreutils \
 		   ostree ostree-init \
 		   strace \
 		   bash \
 		   tar \
+		   grep \
 		   gawk \
 		   ncurses \
 		   python-modules \
 		   python-misc"
 
-RDEPENDS += "${PACKAGE_INSTALL}"
+PACKAGE_INSTALL = "${RECIPE_PACKAGES} ${IMAGE_INSTALL}"
+
+RDEPENDS += "${RECIPE_PACKAGES}"
 DEPENDS += "makedevs-native virtual/fakeroot-native"
 
 EXCLUDE_FROM_WORLD = "1"
diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
index 7f815a9e..59a2990a 100644
--- a/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
+++ b/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
@@ -7,9 +7,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit gnomeos-contents
 
-PACKAGE_INSTALL += "task-core-sdk \
+RECIPE_PACKAGES += "task-core-sdk \
 		python-dev \
 		bison flex \
 		git \
 		libxml-parser-perl \
 		"
+
+IMAGE_INSTALL += "libuuid-dev \
+		  libblkid-dev \
+		  "