summaryrefslogtreecommitdiffstats
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)
downloadpoky-b1ce4327e8a40b0ea4b6b249c5dca58a82a569e3.tar.gz
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 5245d6e2b3..281c3bba0a 100644
--- a/meta/packages/udev/udev.inc
+++ b/meta/packages/udev/udev.inc
@@ -14,10 +14,11 @@ SRC_URI += " \
14 14
15UDEV_DEVFS_RULES ?= "0" 15UDEV_DEVFS_RULES ?= "0"
16 16
17PACKAGES =+ "udev-utils" 17PACKAGES =+ "udev-utils libvolume-id"
18FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest" 18FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
19FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
19 20
20inherit update-rc.d 21inherit update-rc.d autotools pkgconfig
21 22
22INITSCRIPT_NAME = "udev" 23INITSCRIPT_NAME = "udev"
23INITSCRIPT_PARAMS = "start 04 S ." 24INITSCRIPT_PARAMS = "start 04 S ."
@@ -60,3 +61,7 @@ do_install () {
60 install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh 61 install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
61 install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts 62 install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
62} 63}
64
65do_stage () {
66 autotools_stage_all
67}
diff --git a/meta/packages/udev/udev_092.bb b/meta/packages/udev/udev_092.bb
index 87febedf05..bd9c771904 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
3the hotplug package and requires a kernel not older than 2.6.12." 3the hotplug package and requires a kernel not older than 2.6.12."
4RPROVIDES = "hotplug" 4RPROVIDES = "hotplug"
5 5
6PR = "r11" 6PR = "r12"
7 7
8SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ 8SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
9 file://noasmlinkage.patch;patch=1 \ 9 file://noasmlinkage.patch;patch=1 \
@@ -24,7 +24,7 @@ INITSCRIPT_PARAMS = "start 03 S ."
24FILES_${PN} += "${base_libdir}/udev/*" 24FILES_${PN} += "${base_libdir}/udev/*"
25FILES_${PN}-dbg += "${base_libdir}/udev/.debug" 25FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
26UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" 26UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
27EXTRA_OEMAKE += "libudevdir=/lib/udev" 27EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
28 28
29do_install () { 29do_install () {
30 install -d ${D}${usrsbindir} \ 30 install -d ${D}${usrsbindir} \