From 61992fd4af4a3c735a99e78db72a1137a08c2d2d Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 20 Nov 2006 16:26:10 +0000
Subject: [PATCH] udev: Package and stage libvolume-id as required by HAL

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@888 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/udev/udev.inc    | 9 +++++++--
 meta/packages/udev/udev_092.bb | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/meta/packages/udev/udev.inc b/meta/packages/udev/udev.inc
index 5245d6e..281c3bb 100644
--- a/meta/packages/udev/udev.inc
+++ b/meta/packages/udev/udev.inc
@@ -14,10 +14,11 @@ SRC_URI += " \
 
 UDEV_DEVFS_RULES ?= "0"
 
-PACKAGES =+ "udev-utils"
+PACKAGES =+ "udev-utils libvolume-id"
 FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
+FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
 
-inherit update-rc.d
+inherit update-rc.d autotools pkgconfig
 
 INITSCRIPT_NAME = "udev"
 INITSCRIPT_PARAMS = "start 04 S ."
@@ -60,3 +61,7 @@ do_install () {
 	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
 	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
 }
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/meta/packages/udev/udev_092.bb b/meta/packages/udev/udev_092.bb
index 87febed..bd9c771 100644
--- a/meta/packages/udev/udev_092.bb
+++ b/meta/packages/udev/udev_092.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES = "hotplug"
 
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
@@ -24,7 +24,7 @@ INITSCRIPT_PARAMS = "start 03 S ."
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
-EXTRA_OEMAKE += "libudevdir=/lib/udev"
+EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
 
 do_install () {
 	install -d ${D}${usrsbindir} \
-- 
2.7.4