udev: update to 118, remove noasmlinkage patch in favour of 'sed'

10 files changed, 11 insertions, 43 deletions

diff --git a/packages/udev/udev-115/noasmlinkage.patch b/packages/udev/udev-115/noasmlinkage.patch
deleted file mode 100644
index 5824d29590..0000000000
--- a/packages/udev/udev-115/noasmlinkage.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
----
- udevd.c     |    2 +-
- udevstart.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: udev-115/udevd.c
-===================================================================
---- udev-115.orig/udevd.c	2007-08-24 01:29:54.000000000 +0200
-+++ udev-115/udevd.c	2007-09-20 17:04:51.000000000 +0200
-@@ -767,7 +767,7 @@
- 	return msg;
- }
- 
--static void asmlinkage sig_handler(int signum)
-+static void sig_handler(int signum)
- {
- 	switch (signum) {
- 		case SIGINT:
-Index: udev-115/udevstart.c
-===================================================================
---- udev-115.orig/udevstart.c	2007-08-24 01:29:54.000000000 +0200
-+++ udev-115/udevstart.c	2007-09-20 17:04:51.000000000 +0200
-@@ -304,7 +304,7 @@
- 	}
- }
- 
--static void asmlinkage sig_handler(int signum)
-+static void sig_handler(int signum)
- {
- 	switch (signum) {
- 		case SIGALRM:
diff --git a/packages/udev/udev-115/.mtn2git_empty b/packages/udev/udev-118/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/udev/udev-115/.mtn2git_empty
+++ b/packages/udev/udev-118/.mtn2git_empty
diff --git a/packages/udev/udev-115/flags.patch b/packages/udev/udev-118/flags.patch
index 13f20eb6a8..13f20eb6a8 100644
--- a/packages/udev/udev-115/flags.patch
+++ b/packages/udev/udev-118/flags.patch
diff --git a/packages/udev/udev-115/init b/packages/udev/udev-118/init
index 73c655a0ee..73c655a0ee 100644
--- a/packages/udev/udev-115/init
+++ b/packages/udev/udev-118/init
diff --git a/packages/udev/udev-115/local.rules b/packages/udev/udev-118/local.rules
index 5b926018f5..5b926018f5 100644
--- a/packages/udev/udev-115/local.rules
+++ b/packages/udev/udev-118/local.rules
diff --git a/packages/udev/udev-115/permissions.rules b/packages/udev/udev-118/permissions.rules
index 99e03b1036..99e03b1036 100644
--- a/packages/udev/udev-115/permissions.rules
+++ b/packages/udev/udev-118/permissions.rules
diff --git a/packages/udev/udev-115/udev.rules b/packages/udev/udev-118/udev.rules
index 72be706e84..72be706e84 100644
--- a/packages/udev/udev-115/udev.rules
+++ b/packages/udev/udev-118/udev.rules
diff --git a/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch b/packages/udev/udev-118/udevtrigger_add_devname_filtering.patch
index 87cafcaa9d..87cafcaa9d 100644
--- a/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch
+++ b/packages/udev/udev-118/udevtrigger_add_devname_filtering.patch
diff --git a/packages/udev/udev-115/vol_id_ld.patch b/packages/udev/udev-118/vol_id_ld.patch
index 11126eef8d..11126eef8d 100644
--- a/packages/udev/udev-115/vol_id_ld.patch
+++ b/packages/udev/udev-118/vol_id_ld.patch
diff --git a/packages/udev/udev_115.bb b/packages/udev/udev_118.bb
index 9dd0bf2c8f..a4c12877f5 100644
--- a/packages/udev/udev_115.bb
+++ b/packages/udev/udev_118.bb
@@ -7,13 +7,13 @@ PR = "r0"
 
 DEFAULT_PREFERENCE = "-115"
 
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch;patch=1 \
-	   file://flags.patch;patch=1 \
-	   file://vol_id_ld.patch;patch=1 \
-	   file://udevtrigger_add_devname_filtering.patch;patch=1 \
-	   file://mount.blacklist \
-	   "
+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://mount.blacklist \
+"
 
 require udev.inc
 
@@ -24,6 +24,10 @@ FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
 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} \