Browse Source

hal: fixed hangup on hal start due to move of udev binaries from /sbin

	to /usr/bin in the latest udev update.
Pawel "l0ner" Soltys 7 years ago
parent
commit
9eaa7eb86b

+ 5
- 3
arch/3.5.13/trinity-base/hal/PKGBUILD View File

@@ -16,7 +16,8 @@ options=('!libtool' '!makeflags')
16 16
 install=hal.install
17 17
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
18 18
          hald
19
-         hal.patch)
19
+         hal.patch
20
+         udev-update.patch)
20 21
 #        patches/hal-0.5.9-hide-diagnostic.patch
21 22
 #        patches/hal-remove-dell-killswitch.patch
22 23
 #        patches/hal-KVM-evdev.patch
@@ -32,7 +33,8 @@ source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
32 33
 
33 34
 md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
34 35
          '4cdfc673ad65ddb51919f5a757f62145'
35
-         '185dd5d6ffc703ec8395b4eb3a1ae498')
36
+         '185dd5d6ffc703ec8395b4eb3a1ae498'
37
+         'cad3564de1708603c7a1e0facf6b1921')
36 38
 #         '4d4b6801a1cedca22b8bdd9db73b16fb'
37 39
 #         '6d87c3e63184ae3a69caafc846f538a3'
38 40
 #         '6507e5091ee2d11a87ae738a8e2caecb'
@@ -50,7 +52,7 @@ build() {
50 52
    cd $srcdir
51 53
   patch -Np1 -d ${srcdir} < hal.patch
52 54
   cd "${srcdir}/${pkgname}-${pkgver}"
53
-#  patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch"
55
+  patch -Np1 -i "${srcdir}/udev-update.patch"
54 56
 #  patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch"
55 57
 #  patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch"
56 58
 #  patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch"

+ 26
- 0
arch/3.5.13/trinity-base/hal/udev-update.patch View File

@@ -0,0 +1,26 @@
1
+diff -ur hal-0.5.14_origin/hald/linux/blockdev.c hal-0.5.14/hald/linux/blockdev.c
2
+--- hal-0.5.14_origin/hald/linux/blockdev.c	2012-02-15 01:44:51.000000000 +0100
3
++++ hal-0.5.14/hald/linux/blockdev.c	2012-02-15 01:45:12.000000000 +0100
4
+@@ -1864,7 +1864,7 @@
5
+         char *ret;
6
+         char *u_stdout;
7
+         int u_exit_status;
8
+-        const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
9
++        const char *argv[] = {"/usr/bin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
10
+         GError *g_error;
11
+ 
12
+         ret = NULL;
13
+diff -ur hal-0.5.14_origin/hald/linux/coldplug.c hal-0.5.14/hald/linux/coldplug.c
14
+--- hal-0.5.14_origin/hald/linux/coldplug.c	2012-02-15 01:44:51.000000000 +0100
15
++++ hal-0.5.14/hald/linux/coldplug.c	2012-02-15 01:45:08.000000000 +0100
16
+@@ -154,8 +154,8 @@
17
+ static gboolean
18
+ hal_util_init_sysfs_to_udev_map (void)
19
+ {
20
+-	char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL };
21
+-	char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL };
22
++	char *udevdb_export_argv[] = { "/usr/bin/udevadm", "info", "-e", NULL };
23
++	char *udevroot_argv[] = { "/usr/bin/udevadm", "info", "-r", NULL };
24
+ 	int udevinfo_exitcode;
25
+ 	UdevInfo *info = NULL;
26
+ 	char *p;

Loading…
Cancel
Save