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/packages/hal/files | |
| parent | caab7fc509bf27706ff3248689f6afd04225cfda (diff) | |
| download | openembedded-core-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz openembedded-core-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.bz2 openembedded-core-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.xz openembedded-core-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.zip | |
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/hal/files')
| -rwxr-xr-x | meta/packages/hal/files/20hal | 58 | ||||
| -rw-r--r-- | meta/packages/hal/files/autoconf.diff | 11 | ||||
| -rw-r--r-- | meta/packages/hal/files/hal-right-input-h.patch | 29 | ||||
| -rw-r--r-- | meta/packages/hal/files/sg-inhibit.patch | 24 |
4 files changed, 0 insertions, 122 deletions
diff --git a/meta/packages/hal/files/20hal b/meta/packages/hal/files/20hal deleted file mode 100755 index 5b97c4f9e..000000000 --- a/meta/packages/hal/files/20hal +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/sh -# -# hal Start the Daemon that stores device informations -# for the Hardware abstraction layer -# -# Written by Martin Waitz based on skeleton code -# written by Miquel van Smoorenburg <miquels@cistron.nl>. -# Modified for Debian -# by Ian Murdock <imurdock@gnu.ai.mit.edu>. -# - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/hald -PIDDIR=/var/run/hald -PIDFILE=$PIDDIR/hald.pid -NAME=hald -DAEMONUSER=haldaemon -DESC="Hardware abstraction layer" - -test -x $DAEMON || exit 0 - -set -e - -do_start() { - if [ ! -d $PIDDIR ]; then - mkdir -p $PIDDIR - chown $DAEMONUSER:$DAEMONUSER $PIDDIR - fi - echo "Starting $DESC" "$NAME" - start-stop-daemon --start --pidfile $PIDFILE \ - --exec $DAEMON -- $DAEMON_OPTS -} - -do_stop() { - echo "Stopping $DESC" "$NAME" - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - --exec $DAEMON -} - -case "$1" in - start) - do_start - ;; - stop) - do_stop - ;; - restart|force-reload) - do_stop - sleep 5 - do_start - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/meta/packages/hal/files/autoconf.diff b/meta/packages/hal/files/autoconf.diff deleted file mode 100644 index eb30cccdb..000000000 --- a/meta/packages/hal/files/autoconf.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- hal-0.5.9/configure.in~ 2007-04-03 05:36:44.000000000 +0100 -+++ hal-0.5.9/configure.in 2007-04-03 10:29:39.000000000 +0100 -@@ -6,7 +6,7 @@ - # Patches for that is welcome. - # - --AC_PREREQ(2.59c) -+AC_PREREQ(2.59) - AC_INIT(hal, 0.5.9, david@fubar.dk) - AM_INIT_AUTOMAKE(hal, 0.5.9) - AM_CONFIG_HEADER(config.h) diff --git a/meta/packages/hal/files/hal-right-input-h.patch b/meta/packages/hal/files/hal-right-input-h.patch deleted file mode 100644 index f820b7790..000000000 --- a/meta/packages/hal/files/hal-right-input-h.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/configure.in b/configure.in -index e76ff51..5e8cc21 100644 ---- a/configure.in -+++ b/configure.in -@@ -983,6 +983,11 @@ AC_ARG_WITH([linux-input-header], - [Use an given Linux input.h rather than that installed on the system (<linux/input.h>)])) - if test "x$with_linux_input_header" != "x"; then - AC_DEFINE_UNQUOTED(HAL_LINUX_INPUT_HEADER_H, "$with_linux_input_header", [If set, the header to use instead of <linux/input.h>]) -+ LINUX_INPUT_H=$with_linux_input_header -+ AC_SUBST(LINUX_INPUT_H) -+else -+ LINUX_INPUT_H=/usr/include/linux/input.h -+ AC_SUBST(LINUX_INPUT_H) - fi - - dnl -diff --git a/tools/Makefile.am b/tools/Makefile.am -index ae03edd..7d1cbab 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -79,7 +79,7 @@ endif - if BUILD_KEYMAPS - - if HAVE_GPERF --hal-setup-keymap-keys.txt: /usr/include/linux/input.h -+hal-setup-keymap-keys.txt: @LINUX_INPUT_H@ - awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@ - - hal-setup-keymap-hash-name.gperf: hal-setup-keymap-keys.txt diff --git a/meta/packages/hal/files/sg-inhibit.patch b/meta/packages/hal/files/sg-inhibit.patch deleted file mode 100644 index f0cc41448..000000000 --- a/meta/packages/hal/files/sg-inhibit.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- hal-0.5.9.1/hald/linux/probing/linux_dvd_rw_utils.c.old 2007-08-03 17:24:12.000000000 +0100 -+++ hal-0.5.9.1/hald/linux/probing/linux_dvd_rw_utils.c 2007-08-03 17:25:06.000000000 +0100 -@@ -58,6 +58,10 @@ - - #include "linux_dvd_rw_utils.h" - -+#if defined(SG_FLAG_UNUSED_LUN_INHIBIT) -+# define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT -+#endif -+ - typedef enum { - NONE = CGC_DATA_NONE, // 3 - READ = CGC_DATA_READ, // 2 -@@ -153,8 +153,8 @@ - errno = EIO; - ret = -1; - if (cmd->sg_io.masked_status & CHECK_CONDITION) { -- CREAM_ON_ERRNO (cmd->sg_io.sbp); -- ret = ERRCODE (cmd->sg_io.sbp); -+ CREAM_ON_ERRNO ((char*)cmd->sg_io.sbp); -+ ret = ERRCODE ((char*)cmd->sg_io.sbp); - if (ret == 0) - ret = -1; - } |
