From b08878b547da510c22767544c24cfd75ad24a5bb Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 12 Feb 2008 13:24:39 +0000 Subject: [PATCH] udev: update to 118, remove noasmlinkage patch in favour of 'sed' --- packages/udev/udev-115/noasmlinkage.patch | 36 ------------------- .../{udev-115 => udev-118}/.mtn2git_empty | 0 .../udev/{udev-115 => udev-118}/flags.patch | 0 packages/udev/{udev-115 => udev-118}/init | 0 .../udev/{udev-115 => udev-118}/local.rules | 0 .../{udev-115 => udev-118}/permissions.rules | 0 .../udev/{udev-115 => udev-118}/udev.rules | 0 .../udevtrigger_add_devname_filtering.patch | 0 .../{udev-115 => udev-118}/vol_id_ld.patch | 0 packages/udev/{udev_115.bb => udev_118.bb} | 18 ++++++---- 10 files changed, 11 insertions(+), 43 deletions(-) delete mode 100644 packages/udev/udev-115/noasmlinkage.patch rename packages/udev/{udev-115 => udev-118}/.mtn2git_empty (100%) rename packages/udev/{udev-115 => udev-118}/flags.patch (100%) rename packages/udev/{udev-115 => udev-118}/init (100%) rename packages/udev/{udev-115 => udev-118}/local.rules (100%) rename packages/udev/{udev-115 => udev-118}/permissions.rules (100%) rename packages/udev/{udev-115 => udev-118}/udev.rules (100%) rename packages/udev/{udev-115 => udev-118}/udevtrigger_add_devname_filtering.patch (100%) rename packages/udev/{udev-115 => udev-118}/vol_id_ld.patch (100%) rename packages/udev/{udev_115.bb => udev_118.bb} (88%) 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 similarity index 100% rename from packages/udev/udev-115/.mtn2git_empty rename to packages/udev/udev-118/.mtn2git_empty diff --git a/packages/udev/udev-115/flags.patch b/packages/udev/udev-118/flags.patch similarity index 100% rename from packages/udev/udev-115/flags.patch rename to packages/udev/udev-118/flags.patch diff --git a/packages/udev/udev-115/init b/packages/udev/udev-118/init similarity index 100% rename from packages/udev/udev-115/init rename to packages/udev/udev-118/init diff --git a/packages/udev/udev-115/local.rules b/packages/udev/udev-118/local.rules similarity index 100% rename from packages/udev/udev-115/local.rules rename to packages/udev/udev-118/local.rules diff --git a/packages/udev/udev-115/permissions.rules b/packages/udev/udev-118/permissions.rules similarity index 100% rename from packages/udev/udev-115/permissions.rules rename to packages/udev/udev-118/permissions.rules diff --git a/packages/udev/udev-115/udev.rules b/packages/udev/udev-118/udev.rules similarity index 100% rename from packages/udev/udev-115/udev.rules rename to 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 similarity index 100% rename from packages/udev/udev-115/udevtrigger_add_devname_filtering.patch rename to 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 similarity index 100% rename from packages/udev/udev-115/vol_id_ld.patch rename to packages/udev/udev-118/vol_id_ld.patch diff --git a/packages/udev/udev_115.bb b/packages/udev/udev_118.bb similarity index 88% rename from packages/udev/udev_115.bb rename to 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} \ -- 2.39.5