[oe-commits] org.oe.dev udev: Stop questionable device-specific hacks from contaminating PACKAGE_ARCH.

[pfalcon commit]

udev: Stop questionable device-specific hacks from contaminating PACKAGE_ARCH.
* Instead, put into own package and make machines RDEPEND on it per their likes.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 5ecf8117de2ebe416083ba52ab12289748866db0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5ecf8117de2ebe416083ba52ab12289748866db0
Files:
1
packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb
conf/machine/h2200.conf
packages/udev/udev_092.bb
packages/udev/udev_097.bb
packages/udev/udev_100.bb
Diffs:

#
# mt diff -r3e0dc8db46885f658b4c7339a550d0b35d3a1166 -r5ecf8117de2ebe416083ba52ab12289748866db0
#
# 
# 
# add_file "packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb"
#  content [bc1b93ec2ff1f976ed908e17e3b4469f1539b0d2]
# 
# patch "conf/machine/h2200.conf"
#  from [06be039ceb7fc91de15ca6a3389483ee6372798f]
#    to [ff1f7205bab8be68726927066f32d2c9dbc19f32]
# 
# patch "packages/udev/udev_092.bb"
#  from [9c280c1d2cc7237d3dd3cc93dd6a6861334b7786]
#    to [3b1cae0e753955c3ad4b534712c7f13582d9a938]
# 
# patch "packages/udev/udev_097.bb"
#  from [8d341ef0c55e6945df0f9050797bba9644b6d15b]
#    to [1944d7e0e7e54cc38dcca0c59c66c7080828011f]
# 
# patch "packages/udev/udev_100.bb"
#  from [cf318dbe137533d51d411b1f6361520cd7e366a3]
#    to [3a32c3de3de21597a8c1984dbf4e9892cafda3b0]
# 
============================================================
--- packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb	bc1b93ec2ff1f976ed908e17e3b4469f1539b0d2
+++ packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb	bc1b93ec2ff1f976ed908e17e3b4469f1539b0d2
@@ -0,0 +1,9 @@
+DESCRIPTION = "A hack to force VCC to 5v for hostap_cs cards. This will fry your \
+card one sweet day."
+
+SRC_URI = " file://50-hostap_cs.rules "
+
+do_install() {
+	install -d ${D}${sysconfdir}/udev/rules.d/
+	install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}
============================================================
--- conf/machine/h2200.conf	06be039ceb7fc91de15ca6a3389483ee6372798f
+++ conf/machine/h2200.conf	ff1f7205bab8be68726927066f32d2c9dbc19f32
@@ -26,7 +26,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 
-MACHINE_EXTRA_RDEPENDS = "h2200-bootloader"
+MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround"
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
 
 #
============================================================
--- packages/udev/udev_092.bb	9c280c1d2cc7237d3dd3cc93dd6a6861334b7786
+++ packages/udev/udev_092.bb	3b1cae0e753955c3ad4b534712c7f13582d9a938
@@ -1,9 +1,9 @@ RPROVIDES_${PN} = "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_${PN} = "hotplug"
 
-PR = "r19"
+PR = "r20"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
@@ -14,9 +14,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
 	   file://mount.blacklist \
 	   "
 
-SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
-PACKAGE_ARCH_h2200 = "h2200"
-
 require udev.inc
 
 INITSCRIPT_PARAMS = "start 03 S ."
@@ -55,10 +52,6 @@ do_install () {
 	install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize
 }
 
-do_install_append_h2200() {
-	install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
-}
-
 pkg_postinst_append() {
 
 	# Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
============================================================
--- packages/udev/udev_097.bb	8d341ef0c55e6945df0f9050797bba9644b6d15b
+++ packages/udev/udev_097.bb	1944d7e0e7e54cc38dcca0c59c66c7080828011f
@@ -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 = "r9"
+PR = "r10"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
@@ -18,9 +18,6 @@ require udev.inc
 
 require udev.inc
 
-SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
-PACKAGE_ARCH_h2200 = "h2200"
-
 INITSCRIPT_PARAMS = "start 03 S ."
 
 FILES_${PN} += "${base_libdir}/udev/*"
============================================================
--- packages/udev/udev_100.bb	cf318dbe137533d51d411b1f6361520cd7e366a3
+++ packages/udev/udev_100.bb	3a32c3de3de21597a8c1984dbf4e9892cafda3b0
@@ -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 = "r8"
+PR = "r9"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
@@ -19,9 +19,6 @@ require udev.inc
 
 require udev.inc
 
-SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
-PACKAGE_ARCH_h2200 = "h2200"
-
 INITSCRIPT_PARAMS = "start 03 S ."
 
 FILES_${PN} += "${base_libdir}/udev/*"
@@ -56,10 +53,6 @@ do_install () {
 	install -d ${D}${base_libdir}/udev/
 }
 
-do_install_append_h2200() {
-	install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
-}
-
 pkg_postinst_append() {
 
 	# Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,