[arch-commits] Commit in hal/trunk (fix-udev-compatibility.patch)

[Thomas Baechler]

    Date: Friday, September 12, 2008 @ 13:40:43
  Author: thomas
Revision: 12308

complete the hal/udev fix

Modified:
  hal/trunk/fix-udev-compatibility.patch

------------------------------+
 fix-udev-compatibility.patch |   30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

Modified: fix-udev-compatibility.patch
===================================================================
--- fix-udev-compatibility.patch	2008-09-12 16:37:27 UTC (rev 12307)
+++ fix-udev-compatibility.patch	2008-09-12 17:40:43 UTC (rev 12308)
@@ -1,17 +1,7 @@
-From: Danny Kukawka <danny.kukawka at web.de>
-Date: Wed, 27 Aug 2008 19:24:33 +0000 (+0200)
-Subject: use udevadm instead of (deprecated) udevinfo
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=f6af40c1e7ea54e69eb2d259d91dd212065d5f6e
-
-use udevadm instead of (deprecated) udevinfo
-
-Use udevadm instead of (deprecated) udevinfo. Adapted/fixed version
-of a patch contributed by Lucas Hazel <lucas at die.net.au> via HAL ML.
----
-
---- a/hald/linux/blockdev.c
-+++ b/hald/linux/blockdev.c
-@@ -1770,7 +1770,7 @@ udev_get_device_file_for_sysfs_path (con
+diff -Nur hal-0.5.11.orig/hald/linux/blockdev.c hal-0.5.11/hald/linux/blockdev.c
+--- hal-0.5.11.orig/hald/linux/blockdev.c	2008-05-08 01:23:41.000000000 +0200
++++ hal-0.5.11/hald/linux/blockdev.c	2008-09-12 19:38:36.000000000 +0200
+@@ -1750,11 +1750,11 @@
          char *ret;
          char *u_stdout;
          int u_exit_status;
@@ -20,9 +10,15 @@
          GError *g_error;
  
          ret = NULL;
---- a/hald/linux/coldplug.c
-+++ b/hald/linux/coldplug.c
-@@ -149,8 +149,8 @@ udev_info_to_hotplug_event (const UdevIn
+-        argv[5] = sysfs_path;
++        argv[6] = sysfs_path;
+ 
+         g_error = NULL;
+ 
+diff -Nur hal-0.5.11.orig/hald/linux/coldplug.c hal-0.5.11/hald/linux/coldplug.c
+--- hal-0.5.11.orig/hald/linux/coldplug.c	2008-05-08 01:23:32.000000000 +0200
++++ hal-0.5.11/hald/linux/coldplug.c	2008-09-12 19:37:47.000000000 +0200
+@@ -149,8 +149,8 @@
  static gboolean
  hal_util_init_sysfs_to_udev_map (void)
  {