[oe-commits] org.oe.dev udev-118: go back in time to udev-115 which seems to work slightly better on some Zaurus models

[mickeyl commit]

udev-118: go back in time to udev-115 which seems to work slightly better on some Zaurus models
Zaurus models: need to force downgrade, I don't want to raise PE here.

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: a41ea1ad763bed9b2597a75fd878c89397de75e0
ViewMTN: http://monotone.openembedded.org/revision/info/a41ea1ad763bed9b2597a75fd878c89397de75e0
Files:
1
packages/udev/udev-118
packages/udev/udev-115
packages/udev/udev_118.bb
packages/udev/udev_115.bb
packages/udev/udev.inc
Diffs:

#
# mt diff -re38fc8b0fb68bf496659ddadf1683e5bb727787b -ra41ea1ad763bed9b2597a75fd878c89397de75e0
#
#
#
# rename "packages/udev/udev-118"
#     to "packages/udev/udev-115"
# 
# rename "packages/udev/udev_118.bb"
#     to "packages/udev/udev_115.bb"
# 
# patch "packages/udev/udev.inc"
#  from [990d77d40ab8d7e4cb5591753b94745f74c8d3f5]
#    to [49710b68d98e1e657a061b37f9928ea6c1bd50cf]
# 
# patch "packages/udev/udev_115.bb"
#  from [24baff693869f60ab4cf21d6e7240780d896129f]
#    to [3503ed52ca771ca627b742c2fba8cf14e4ccc361]
#
============================================================
--- packages/udev/udev.inc	990d77d40ab8d7e4cb5591753b94745f74c8d3f5
+++ packages/udev/udev.inc	49710b68d98e1e657a061b37f9928ea6c1bd50cf
@@ -2,15 +2,16 @@ LICENSE = "GPL"
 /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
 LICENSE = "GPL"
 
-SRC_URI += " \
-	   file://udev.rules \
-	   file://devfs-udev.rules \
-	   file://links.conf \
-           file://permissions.rules \
-	   file://mount.sh \
-	   file://network.sh \
-	   file://local.rules \
-           file://init"
+SRC_URI += "\
+  file://udev.rules \
+  file://devfs-udev.rules \
+  file://links.conf \
+  file://permissions.rules \
+  file://mount.sh \
+  file://network.sh \
+  file://local.rules \
+  file://init \
+"
 
 inherit update-rc.d autotools pkgconfig
 
@@ -37,9 +38,11 @@ do_install () {
 		'STRIP=echo'"
 
 do_install () {
-	install -d ${D}${usrsbindir} \
-		   ${D}${sbindir}
+	install -d ${D}${usrsbindir}
+	install -d ${D}${sbindir}
+
 	oe_runmake 'DESTDIR=${D}' INSTALL=install install
+
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
 
@@ -60,8 +63,8 @@ do_stage () {
 
 do_stage () {
 	autotools_stage_all
-        install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR}
-        oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR}
+	install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR}
+	oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR}
 }
 
 PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
============================================================
--- packages/udev/udev_118.bb	24baff693869f60ab4cf21d6e7240780d896129f
+++ packages/udev/udev_115.bb	3503ed52ca771ca627b742c2fba8cf14e4ccc361
@@ -2,16 +2,14 @@ RPROVIDES_${PN} = "hotplug"
 /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 = "r0"
 
-PR = "r3"
-
-DEFAULT_PREFERENCE = "-118"
-
 SRC_URI = "\
  http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
  file://flags.patch;patch=1 \
  file://vol_id_ld.patch;patch=1 \
  file://udevtrigger_add_devname_filtering.patch;patch=1 \
+ file://noasmlinkage.patch;patch=1 \
  file://mount.blacklist \
 "
 
@@ -24,15 +22,13 @@ EXTRA_OEMAKE += "libudevdir=/lib/udev li
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
 EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
 
-do_compile_prepend() {
-	sed -i s,asmlinkage,, *.c
-}
-
 do_install () {
-	install -d ${D}${usrsbindir} \
-                   ${D}${sysconfdir} \
-                   ${D}${sbindir}
+	install -d ${D}${usrsbindir}
+	install -d ${D}${sysconfdir}
+	install -d ${D}${sbindir}
+
 	oe_runmake 'DESTDIR=${D}' INSTALL=install install
+
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev