aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-11-28 15:14:48 +0000
committerKoen Kooi <koen@openembedded.org>2006-11-28 15:14:48 +0000
commit85fd8977a23877d01352fdbd87998a36a0bbe0ff (patch)
tree9d85cd87799b524c8aa42fb5c19e673d885adebd /packages
parent3f470438075ff760f3ccbcb11535b41c8c106dae (diff)
downloadopenembedded-85fd8977a23877d01352fdbd87998a36a0bbe0ff.tar.gz
openembedded-85fd8977a23877d01352fdbd87998a36a0bbe0ff.tar.bz2
openembedded-85fd8977a23877d01352fdbd87998a36a0bbe0ff.zip
udev: merge stuff from 097 and 100 into udev.inc, add do_stage from poky, bump PR
Diffstat (limited to 'packages')
-rw-r--r--packages/udev/udev.inc12
-rw-r--r--packages/udev/udev_092.bb4
-rw-r--r--packages/udev/udev_097.bb6
-rw-r--r--packages/udev/udev_100.bb6
4 files changed, 14 insertions, 14 deletions
diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index 5245d6e2b3..32b9b28784 100644
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -14,10 +14,14 @@ SRC_URI += " \
UDEV_DEVFS_RULES ?= "0"
-PACKAGES =+ "udev-utils"
+PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
+PKG_libvolume-id-dev = "libvolume-id-dev"
+
+FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
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 +64,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/packages/udev/udev_092.bb b/packages/udev/udev_092.bb
index 3d33938fb1..7954376d08 100644
--- a/packages/udev/udev_092.bb
+++ b/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 = "r13"
+PR = "r14"
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} \
diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb
index 497357775e..79ea7b06de 100644
--- a/packages/udev/udev_097.bb
+++ b/packages/udev/udev_097.bb
@@ -8,7 +8,7 @@ used to detect the type of a file system and read its metadata."
DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
needed to link programs with libvolume_id."
-PR = "r4"
+PR = "r5"
SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://noasmlinkage.patch;patch=1 \
@@ -23,10 +23,6 @@ PACKAGE_ARCH_h2200 = "h2200"
INITSCRIPT_PARAMS = "start 03 S ."
-PACKAGES =+ "libvolume-id-dev libvolume-id"
-PKG_libvolume-id-dev = "libvolume-id-dev"
-FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
-FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
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/"
diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb
index 183d785627..b17f852c64 100644
--- a/packages/udev/udev_100.bb
+++ b/packages/udev/udev_100.bb
@@ -9,7 +9,7 @@ used to detect the type of a file system and read its metadata."
DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
needed to link programs with libvolume_id."
-PR = "r3"
+PR = "r4"
SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://noasmlinkage.patch;patch=1 \
@@ -24,10 +24,6 @@ PACKAGE_ARCH_h2200 = "h2200"
INITSCRIPT_PARAMS = "start 03 S ."
-PACKAGES =+ "libvolume-id-dev libvolume-id"
-PKG_libvolume-id-dev = "libvolume-id-dev"
-FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
-FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
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/"