From 9eaa7eb86bd627d3636f0d1988c7e867e2f7eebf Mon Sep 17 00:00:00 2001
From: "Pawel \"l0ner\" Soltys" <pwslts@gmail.com>
Date: Wed, 15 Feb 2012 02:00:38 +0100
Subject: hal: fixed hangup on hal start due to move of udev binaries from
 /sbin 	to /usr/bin in the latest udev update.

---
 arch/3.5.13/trinity-base/hal/PKGBUILD          |  8 +++++---
 arch/3.5.13/trinity-base/hal/udev-update.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 arch/3.5.13/trinity-base/hal/udev-update.patch

(limited to 'arch')

diff --git a/arch/3.5.13/trinity-base/hal/PKGBUILD b/arch/3.5.13/trinity-base/hal/PKGBUILD
index f4a30f075..03ad188d7 100644
--- a/arch/3.5.13/trinity-base/hal/PKGBUILD
+++ b/arch/3.5.13/trinity-base/hal/PKGBUILD
@@ -16,7 +16,8 @@ options=('!libtool' '!makeflags')
 install=hal.install
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
          hald
-         hal.patch)
+         hal.patch
+         udev-update.patch)
 #        patches/hal-0.5.9-hide-diagnostic.patch
 #        patches/hal-remove-dell-killswitch.patch
 #        patches/hal-KVM-evdev.patch
@@ -32,7 +33,8 @@ source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
 
 md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
          '4cdfc673ad65ddb51919f5a757f62145'
-         '185dd5d6ffc703ec8395b4eb3a1ae498')
+         '185dd5d6ffc703ec8395b4eb3a1ae498'
+         'cad3564de1708603c7a1e0facf6b1921')
 #         '4d4b6801a1cedca22b8bdd9db73b16fb'
 #         '6d87c3e63184ae3a69caafc846f538a3'
 #         '6507e5091ee2d11a87ae738a8e2caecb'
@@ -50,7 +52,7 @@ build() {
    cd $srcdir
   patch -Np1 -d ${srcdir} < hal.patch
   cd "${srcdir}/${pkgname}-${pkgver}"
-#  patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch"
+  patch -Np1 -i "${srcdir}/udev-update.patch"
 #  patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch"
 #  patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch"
 #  patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch"
diff --git a/arch/3.5.13/trinity-base/hal/udev-update.patch b/arch/3.5.13/trinity-base/hal/udev-update.patch
new file mode 100644
index 000000000..a5be64bc6
--- /dev/null
+++ b/arch/3.5.13/trinity-base/hal/udev-update.patch
@@ -0,0 +1,26 @@
+diff -ur hal-0.5.14_origin/hald/linux/blockdev.c hal-0.5.14/hald/linux/blockdev.c
+--- hal-0.5.14_origin/hald/linux/blockdev.c	2012-02-15 01:44:51.000000000 +0100
++++ hal-0.5.14/hald/linux/blockdev.c	2012-02-15 01:45:12.000000000 +0100
+@@ -1864,7 +1864,7 @@
+         char *ret;
+         char *u_stdout;
+         int u_exit_status;
+-        const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
++        const char *argv[] = {"/usr/bin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
+         GError *g_error;
+ 
+         ret = NULL;
+diff -ur hal-0.5.14_origin/hald/linux/coldplug.c hal-0.5.14/hald/linux/coldplug.c
+--- hal-0.5.14_origin/hald/linux/coldplug.c	2012-02-15 01:44:51.000000000 +0100
++++ hal-0.5.14/hald/linux/coldplug.c	2012-02-15 01:45:08.000000000 +0100
+@@ -154,8 +154,8 @@
+ static gboolean
+ hal_util_init_sysfs_to_udev_map (void)
+ {
+-	char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL };
+-	char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL };
++	char *udevdb_export_argv[] = { "/usr/bin/udevadm", "info", "-e", NULL };
++	char *udevroot_argv[] = { "/usr/bin/udevadm", "info", "-r", NULL };
+ 	int udevinfo_exitcode;
+ 	UdevInfo *info = NULL;
+ 	char *p;
-- 
cgit v1.2.3