diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-07 10:53:06 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-12 14:12:10 +0100 |
commit | 2cf9fb4df498fe0e4fa8356dc663fdfdec9a98cc (patch) | |
tree | 411508c9d098cd199dcb6d129031d9904b8ee7b0 /meta/recipes-support/hal/files | |
parent | b04b8a4e4d720df61e3294781236890e1ab91748 (diff) | |
download | poky-2cf9fb4df498fe0e4fa8356dc663fdfdec9a98cc.tar.gz |
hal/hal-info: This is unsed in OE-Core and deprecated, drop
(From OE-Core rev: 72c010af2c0fe967a5cacc7fbdba75c3ea3e5c3a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/hal/files')
-rwxr-xr-x | meta/recipes-support/hal/files/20hal | 58 | ||||
-rw-r--r-- | meta/recipes-support/hal/files/autoconf.diff | 13 | ||||
-rw-r--r-- | meta/recipes-support/hal/files/hal-right-input-h.patch | 31 | ||||
-rw-r--r-- | meta/recipes-support/hal/files/probe-video4linux.c.patch | 60 | ||||
-rw-r--r-- | meta/recipes-support/hal/files/sg-inhibit.patch | 26 |
5 files changed, 0 insertions, 188 deletions
diff --git a/meta/recipes-support/hal/files/20hal b/meta/recipes-support/hal/files/20hal deleted file mode 100755 index 5b97c4f9e6..0000000000 --- a/meta/recipes-support/hal/files/20hal +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | #! /bin/sh | ||
2 | # | ||
3 | # hal Start the Daemon that stores device informations | ||
4 | # for the Hardware abstraction layer | ||
5 | # | ||
6 | # Written by Martin Waitz based on skeleton code | ||
7 | # written by Miquel van Smoorenburg <miquels@cistron.nl>. | ||
8 | # Modified for Debian | ||
9 | # by Ian Murdock <imurdock@gnu.ai.mit.edu>. | ||
10 | # | ||
11 | |||
12 | PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin | ||
13 | DAEMON=/usr/sbin/hald | ||
14 | PIDDIR=/var/run/hald | ||
15 | PIDFILE=$PIDDIR/hald.pid | ||
16 | NAME=hald | ||
17 | DAEMONUSER=haldaemon | ||
18 | DESC="Hardware abstraction layer" | ||
19 | |||
20 | test -x $DAEMON || exit 0 | ||
21 | |||
22 | set -e | ||
23 | |||
24 | do_start() { | ||
25 | if [ ! -d $PIDDIR ]; then | ||
26 | mkdir -p $PIDDIR | ||
27 | chown $DAEMONUSER:$DAEMONUSER $PIDDIR | ||
28 | fi | ||
29 | echo "Starting $DESC" "$NAME" | ||
30 | start-stop-daemon --start --pidfile $PIDFILE \ | ||
31 | --exec $DAEMON -- $DAEMON_OPTS | ||
32 | } | ||
33 | |||
34 | do_stop() { | ||
35 | echo "Stopping $DESC" "$NAME" | ||
36 | start-stop-daemon --stop --quiet --pidfile $PIDFILE \ | ||
37 | --exec $DAEMON | ||
38 | } | ||
39 | |||
40 | case "$1" in | ||
41 | start) | ||
42 | do_start | ||
43 | ;; | ||
44 | stop) | ||
45 | do_stop | ||
46 | ;; | ||
47 | restart|force-reload) | ||
48 | do_stop | ||
49 | sleep 5 | ||
50 | do_start | ||
51 | ;; | ||
52 | *) | ||
53 | echo "Usage: $0 {start|stop|restart|force-reload}" >&2 | ||
54 | exit 1 | ||
55 | ;; | ||
56 | esac | ||
57 | |||
58 | exit 0 | ||
diff --git a/meta/recipes-support/hal/files/autoconf.diff b/meta/recipes-support/hal/files/autoconf.diff deleted file mode 100644 index 451a2525d9..0000000000 --- a/meta/recipes-support/hal/files/autoconf.diff +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | --- hal-0.5.9/configure.in~ 2007-04-03 05:36:44.000000000 +0100 | ||
4 | +++ hal-0.5.9/configure.in 2007-04-03 10:29:39.000000000 +0100 | ||
5 | @@ -6,7 +6,7 @@ | ||
6 | # Patches for that is welcome. | ||
7 | # | ||
8 | |||
9 | -AC_PREREQ(2.59c) | ||
10 | +AC_PREREQ(2.59) | ||
11 | AC_INIT(hal, 0.5.9, david@fubar.dk) | ||
12 | AM_INIT_AUTOMAKE(hal, 0.5.9) | ||
13 | AM_CONFIG_HEADER(config.h) | ||
diff --git a/meta/recipes-support/hal/files/hal-right-input-h.patch b/meta/recipes-support/hal/files/hal-right-input-h.patch deleted file mode 100644 index 06697ed19d..0000000000 --- a/meta/recipes-support/hal/files/hal-right-input-h.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | diff --git a/configure.in b/configure.in | ||
4 | index e76ff51..5e8cc21 100644 | ||
5 | --- a/configure.in | ||
6 | +++ b/configure.in | ||
7 | @@ -983,6 +983,11 @@ AC_ARG_WITH([linux-input-header], | ||
8 | [Use an given Linux input.h rather than that installed on the system (<linux/input.h>)])) | ||
9 | if test "x$with_linux_input_header" != "x"; then | ||
10 | AC_DEFINE_UNQUOTED(HAL_LINUX_INPUT_HEADER_H, "$with_linux_input_header", [If set, the header to use instead of <linux/input.h>]) | ||
11 | + LINUX_INPUT_H=$with_linux_input_header | ||
12 | + AC_SUBST(LINUX_INPUT_H) | ||
13 | +else | ||
14 | + LINUX_INPUT_H=/usr/include/linux/input.h | ||
15 | + AC_SUBST(LINUX_INPUT_H) | ||
16 | fi | ||
17 | |||
18 | dnl | ||
19 | diff --git a/tools/Makefile.am b/tools/Makefile.am | ||
20 | index ae03edd..7d1cbab 100644 | ||
21 | --- a/tools/Makefile.am | ||
22 | +++ b/tools/Makefile.am | ||
23 | @@ -79,7 +79,7 @@ endif | ||
24 | if BUILD_KEYMAPS | ||
25 | |||
26 | if HAVE_GPERF | ||
27 | -hal-setup-keymap-keys.txt: /usr/include/linux/input.h | ||
28 | +hal-setup-keymap-keys.txt: @LINUX_INPUT_H@ | ||
29 | awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@ | ||
30 | |||
31 | hal-setup-keymap-hash-name.gperf: hal-setup-keymap-keys.txt | ||
diff --git a/meta/recipes-support/hal/files/probe-video4linux.c.patch b/meta/recipes-support/hal/files/probe-video4linux.c.patch deleted file mode 100644 index 0f8140be85..0000000000 --- a/meta/recipes-support/hal/files/probe-video4linux.c.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From ae13d96fa2a0612b6000f4b8f6ed9d3564035703 Mon Sep 17 00:00:00 2001 | ||
4 | From: Michael Biebl <biebl@debian.org> | ||
5 | Date: Sun, 10 Apr 2011 12:54:53 +0000 | ||
6 | Subject: Build hald-probe-video4linux on current kernels again | ||
7 | |||
8 | The hald-probe-video4linux prober supports both v4l1 and v4l2. Support for v4l1 | ||
9 | has been removed from Linux kernel 2.6.38. Instead of disabling the prober | ||
10 | altogether, #ifdef the v4l1 parts when building on a newer kernel. | ||
11 | |||
12 | Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> | ||
13 | --- | ||
14 | (limited to 'hald/linux/probing/probe-video4linux.c') | ||
15 | |||
16 | diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c | ||
17 | index 7bc13e8..b055720 100644 | ||
18 | --- a/hald/linux/probing/probe-video4linux.c | ||
19 | +++ b/hald/linux/probing/probe-video4linux.c | ||
20 | @@ -30,7 +30,9 @@ | ||
21 | #include <sys/types.h> | ||
22 | #include <sys/time.h> | ||
23 | #include <sys/ioctl.h> | ||
24 | +#ifdef HAVE_LINUX_VIDEODEV_H | ||
25 | #include <linux/videodev.h> | ||
26 | +#endif | ||
27 | #include <linux/videodev2.h> | ||
28 | #include <errno.h> | ||
29 | #include <fcntl.h> | ||
30 | @@ -50,7 +52,9 @@ main (int argc, char *argv[]) | ||
31 | int ret = -1; | ||
32 | char *udi; | ||
33 | char *device_file; | ||
34 | +#ifdef HAVE_LINUX_VIDEODEV_H | ||
35 | struct video_capability v1cap; | ||
36 | +#endif | ||
37 | struct v4l2_capability v2cap; | ||
38 | LibHalContext *ctx = NULL; | ||
39 | LibHalChangeSet *cset; | ||
40 | @@ -107,7 +111,9 @@ main (int argc, char *argv[]) | ||
41 | LIBHAL_FREE_DBUS_ERROR (&error); | ||
42 | libhal_device_add_capability (ctx, udi, "video4linux.radio", &error); | ||
43 | } | ||
44 | - } else { | ||
45 | + } | ||
46 | +#ifdef HAVE_LINUX_VIDEODEV_H | ||
47 | + else { | ||
48 | HAL_DEBUG (("ioctl VIDIOC_QUERYCAP failed")); | ||
49 | |||
50 | if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) { | ||
51 | @@ -134,6 +140,7 @@ main (int argc, char *argv[]) | ||
52 | HAL_DEBUG (("ioctl VIDIOCGCAP failed")); | ||
53 | } | ||
54 | } | ||
55 | +#endif | ||
56 | |||
57 | LIBHAL_FREE_DBUS_ERROR (&error); | ||
58 | libhal_device_commit_changeset (ctx, cset, &error); | ||
59 | -- | ||
60 | cgit v0.9.0.2-2-gbebe | ||
diff --git a/meta/recipes-support/hal/files/sg-inhibit.patch b/meta/recipes-support/hal/files/sg-inhibit.patch deleted file mode 100644 index c655c29896..0000000000 --- a/meta/recipes-support/hal/files/sg-inhibit.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- hal-0.5.9.1/hald/linux/probing/linux_dvd_rw_utils.c.old 2007-08-03 17:24:12.000000000 +0100 | ||
4 | +++ hal-0.5.9.1/hald/linux/probing/linux_dvd_rw_utils.c 2007-08-03 17:25:06.000000000 +0100 | ||
5 | @@ -58,6 +58,10 @@ | ||
6 | |||
7 | #include "linux_dvd_rw_utils.h" | ||
8 | |||
9 | +#if defined(SG_FLAG_UNUSED_LUN_INHIBIT) | ||
10 | +# define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT | ||
11 | +#endif | ||
12 | + | ||
13 | typedef enum { | ||
14 | NONE = CGC_DATA_NONE, // 3 | ||
15 | READ = CGC_DATA_READ, // 2 | ||
16 | @@ -153,8 +153,8 @@ | ||
17 | errno = EIO; | ||
18 | ret = -1; | ||
19 | if (cmd->sg_io.masked_status & CHECK_CONDITION) { | ||
20 | - CREAM_ON_ERRNO (cmd->sg_io.sbp); | ||
21 | - ret = ERRCODE (cmd->sg_io.sbp); | ||
22 | + CREAM_ON_ERRNO ((char*)cmd->sg_io.sbp); | ||
23 | + ret = ERRCODE ((char*)cmd->sg_io.sbp); | ||
24 | if (ret == 0) | ||
25 | ret = -1; | ||
26 | } | ||