diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:11 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:57 +0100 |
commit | d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch) | |
tree | f36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta/recipes-support/hal/files | |
parent | caab7fc509bf27706ff3248689f6afd04225cfda (diff) | |
download | poky-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz |
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
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 | 11 | ||||
-rw-r--r-- | meta/recipes-support/hal/files/hal-right-input-h.patch | 29 | ||||
-rw-r--r-- | meta/recipes-support/hal/files/sg-inhibit.patch | 24 |
4 files changed, 122 insertions, 0 deletions
diff --git a/meta/recipes-support/hal/files/20hal b/meta/recipes-support/hal/files/20hal new file mode 100755 index 0000000000..5b97c4f9e6 --- /dev/null +++ b/meta/recipes-support/hal/files/20hal | |||
@@ -0,0 +1,58 @@ | |||
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 new file mode 100644 index 0000000000..eb30cccdbe --- /dev/null +++ b/meta/recipes-support/hal/files/autoconf.diff | |||
@@ -0,0 +1,11 @@ | |||
1 | --- hal-0.5.9/configure.in~ 2007-04-03 05:36:44.000000000 +0100 | ||
2 | +++ hal-0.5.9/configure.in 2007-04-03 10:29:39.000000000 +0100 | ||
3 | @@ -6,7 +6,7 @@ | ||
4 | # Patches for that is welcome. | ||
5 | # | ||
6 | |||
7 | -AC_PREREQ(2.59c) | ||
8 | +AC_PREREQ(2.59) | ||
9 | AC_INIT(hal, 0.5.9, david@fubar.dk) | ||
10 | AM_INIT_AUTOMAKE(hal, 0.5.9) | ||
11 | 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 new file mode 100644 index 0000000000..f820b7790a --- /dev/null +++ b/meta/recipes-support/hal/files/hal-right-input-h.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | diff --git a/configure.in b/configure.in | ||
2 | index e76ff51..5e8cc21 100644 | ||
3 | --- a/configure.in | ||
4 | +++ b/configure.in | ||
5 | @@ -983,6 +983,11 @@ AC_ARG_WITH([linux-input-header], | ||
6 | [Use an given Linux input.h rather than that installed on the system (<linux/input.h>)])) | ||
7 | if test "x$with_linux_input_header" != "x"; then | ||
8 | AC_DEFINE_UNQUOTED(HAL_LINUX_INPUT_HEADER_H, "$with_linux_input_header", [If set, the header to use instead of <linux/input.h>]) | ||
9 | + LINUX_INPUT_H=$with_linux_input_header | ||
10 | + AC_SUBST(LINUX_INPUT_H) | ||
11 | +else | ||
12 | + LINUX_INPUT_H=/usr/include/linux/input.h | ||
13 | + AC_SUBST(LINUX_INPUT_H) | ||
14 | fi | ||
15 | |||
16 | dnl | ||
17 | diff --git a/tools/Makefile.am b/tools/Makefile.am | ||
18 | index ae03edd..7d1cbab 100644 | ||
19 | --- a/tools/Makefile.am | ||
20 | +++ b/tools/Makefile.am | ||
21 | @@ -79,7 +79,7 @@ endif | ||
22 | if BUILD_KEYMAPS | ||
23 | |||
24 | if HAVE_GPERF | ||
25 | -hal-setup-keymap-keys.txt: /usr/include/linux/input.h | ||
26 | +hal-setup-keymap-keys.txt: @LINUX_INPUT_H@ | ||
27 | awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@ | ||
28 | |||
29 | hal-setup-keymap-hash-name.gperf: hal-setup-keymap-keys.txt | ||
diff --git a/meta/recipes-support/hal/files/sg-inhibit.patch b/meta/recipes-support/hal/files/sg-inhibit.patch new file mode 100644 index 0000000000..f0cc41448a --- /dev/null +++ b/meta/recipes-support/hal/files/sg-inhibit.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | --- hal-0.5.9.1/hald/linux/probing/linux_dvd_rw_utils.c.old 2007-08-03 17:24:12.000000000 +0100 | ||
2 | +++ hal-0.5.9.1/hald/linux/probing/linux_dvd_rw_utils.c 2007-08-03 17:25:06.000000000 +0100 | ||
3 | @@ -58,6 +58,10 @@ | ||
4 | |||
5 | #include "linux_dvd_rw_utils.h" | ||
6 | |||
7 | +#if defined(SG_FLAG_UNUSED_LUN_INHIBIT) | ||
8 | +# define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT | ||
9 | +#endif | ||
10 | + | ||
11 | typedef enum { | ||
12 | NONE = CGC_DATA_NONE, // 3 | ||
13 | READ = CGC_DATA_READ, // 2 | ||
14 | @@ -153,8 +153,8 @@ | ||
15 | errno = EIO; | ||
16 | ret = -1; | ||
17 | if (cmd->sg_io.masked_status & CHECK_CONDITION) { | ||
18 | - CREAM_ON_ERRNO (cmd->sg_io.sbp); | ||
19 | - ret = ERRCODE (cmd->sg_io.sbp); | ||
20 | + CREAM_ON_ERRNO ((char*)cmd->sg_io.sbp); | ||
21 | + ret = ERRCODE ((char*)cmd->sg_io.sbp); | ||
22 | if (ret == 0) | ||
23 | ret = -1; | ||
24 | } | ||