summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-20 16:26:10 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-20 16:26:10 +0000
commitb1ce4327e8a40b0ea4b6b249c5dca58a82a569e3 (patch)
treeed75d9d28268ab736da3fed7dea38f88cd31b95e
parent2148aeda3e5a94c4718ec6f45051ad4fe467b5de (diff)
downloadopenembedded-core-b1ce4327e8a40b0ea4b6b249c5dca58a82a569e3.tar.gz
openembedded-core-b1ce4327e8a40b0ea4b6b249c5dca58a82a569e3.tar.bz2
openembedded-core-b1ce4327e8a40b0ea4b6b249c5dca58a82a569e3.tar.xz
openembedded-core-b1ce4327e8a40b0ea4b6b249c5dca58a82a569e3.zip
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
-rw-r--r--meta/packages/udev/udev.inc9
-rw-r--r--meta/packages/udev/udev_092.bb4
2 files changed, 9 insertions, 4 deletions
diff --git a/meta/packages/udev/udev.inc b/meta/packages/udev/udev.inc
index 5245d6e2b..281c3bba0 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 87febedf0..bd9c77190 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} \