[oe-commits] org.oe.dev udev: merge stuff from 097 and 100 into udev.inc, add do_stage from poky, bump PR

[koen commit]

udev: merge stuff from 097 and 100 into udev.inc, add do_stage from poky, bump PR

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 190c717fcefa9f89f739dac0295c41c977c5f2da
ViewMTN: http://monotone.openembedded.org/revision.psp?id=190c717fcefa9f89f739dac0295c41c977c5f2da
Files:
1
packages/udev/udev.inc
packages/udev/udev_092.bb
packages/udev/udev_097.bb
packages/udev/udev_100.bb
Diffs:

#
# mt diff -r9562dbacc0c8663cc9491b5869fd3ffa505a5e75 -r190c717fcefa9f89f739dac0295c41c977c5f2da
#
# 
# 
# patch "packages/udev/udev.inc"
#  from [049bcc9c5652e877e5749a0d630423ddc87f2ca0]
#    to [ccd046941f8c83ad6d9ab96e34d8fe486a585d5e]
# 
# patch "packages/udev/udev_092.bb"
#  from [5c5b0b3f7c06488dd122ebfccb893ea9abad3498]
#    to [f5d72ae52d4e40187bfc4c2ab6f094235cd7d757]
# 
# patch "packages/udev/udev_097.bb"
#  from [0751a8a82dc912a52067c8286ae14e403f6ec543]
#    to [f19f7d690431395d55920bcdceb6ea08ee3055be]
# 
# patch "packages/udev/udev_100.bb"
#  from [a16a463ded3e1780465d4cd1f35285b24d77179e]
#    to [4a85a0228bced936b65a87e7600a56ee9855b970]
# 
============================================================
--- packages/udev/udev.inc	049bcc9c5652e877e5749a0d630423ddc87f2ca0
+++ packages/udev/udev.inc	ccd046941f8c83ad6d9ab96e34d8fe486a585d5e
@@ -14,10 +14,14 @@ UDEV_DEVFS_RULES ?= "0"
 
 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
+}
============================================================
--- packages/udev/udev_092.bb	5c5b0b3f7c06488dd122ebfccb893ea9abad3498
+++ packages/udev/udev_092.bb	f5d72ae52d4e40187bfc4c2ab6f094235cd7d757
@@ -1,9 +1,9 @@ RPROVIDES = "hotplug"
 DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 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 @@ UDEV_EXTRAS = "extras/firmware/ extras/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} \
============================================================
--- packages/udev/udev_097.bb	0751a8a82dc912a52067c8286ae14e403f6ec543
+++ packages/udev/udev_097.bb	f19f7d690431395d55920bcdceb6ea08ee3055be
@@ -8,7 +8,7 @@ needed to link programs with libvolume_i
 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 @@ INITSCRIPT_PARAMS = "start 03 S ."
 
 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/"
============================================================
--- packages/udev/udev_100.bb	a16a463ded3e1780465d4cd1f35285b24d77179e
+++ packages/udev/udev_100.bb	4a85a0228bced936b65a87e7600a56ee9855b970
@@ -9,7 +9,7 @@ needed to link programs with libvolume_i
 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 @@ INITSCRIPT_PARAMS = "start 03 S ."
 
 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/"