summaryrefslogtreecommitdiff
path: root/meta/recipes-support/hal/files
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-07 10:53:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-12 14:10:34 +0100
commit72c010af2c0fe967a5cacc7fbdba75c3ea3e5c3a (patch)
treecaf2b1be1512228c6be2d727a801d245f23b3994 /meta/recipes-support/hal/files
parent4e95c177c4d0ee593945fd020f8d0c22810d8956 (diff)
downloadopenembedded-core-72c010af2c0fe967a5cacc7fbdba75c3ea3e5c3a.tar.gz
openembedded-core-72c010af2c0fe967a5cacc7fbdba75c3ea3e5c3a.tar.bz2
openembedded-core-72c010af2c0fe967a5cacc7fbdba75c3ea3e5c3a.tar.xz
openembedded-core-72c010af2c0fe967a5cacc7fbdba75c3ea3e5c3a.zip
hal/hal-info: This is unsed in OE-Core and deprecated, drop
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/hal/files')
-rwxr-xr-xmeta/recipes-support/hal/files/20hal58
-rw-r--r--meta/recipes-support/hal/files/autoconf.diff13
-rw-r--r--meta/recipes-support/hal/files/hal-right-input-h.patch31
-rw-r--r--meta/recipes-support/hal/files/probe-video4linux.c.patch60
-rw-r--r--meta/recipes-support/hal/files/sg-inhibit.patch26
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 5b97c4f9e..000000000
--- a/meta/recipes-support/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/recipes-support/hal/files/autoconf.diff b/meta/recipes-support/hal/files/autoconf.diff
deleted file mode 100644
index 451a2525d..000000000
--- a/meta/recipes-support/hal/files/autoconf.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- 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/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 06697ed19..000000000
--- a/meta/recipes-support/hal/files/hal-right-input-h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-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/recipes-support/hal/files/probe-video4linux.c.patch b/meta/recipes-support/hal/files/probe-video4linux.c.patch
deleted file mode 100644
index 0f8140be8..000000000
--- a/meta/recipes-support/hal/files/probe-video4linux.c.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Upstream-Status: Backport
-
-From ae13d96fa2a0612b6000f4b8f6ed9d3564035703 Mon Sep 17 00:00:00 2001
-From: Michael Biebl <biebl@debian.org>
-Date: Sun, 10 Apr 2011 12:54:53 +0000
-Subject: Build hald-probe-video4linux on current kernels again
-
-The hald-probe-video4linux prober supports both v4l1 and v4l2. Support for v4l1
-has been removed from Linux kernel 2.6.38. Instead of disabling the prober
-altogether, #ifdef the v4l1 parts when building on a newer kernel.
-
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
-(limited to 'hald/linux/probing/probe-video4linux.c')
-
-diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c
-index 7bc13e8..b055720 100644
---- a/hald/linux/probing/probe-video4linux.c
-+++ b/hald/linux/probing/probe-video4linux.c
-@@ -30,7 +30,9 @@
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/ioctl.h>
-+#ifdef HAVE_LINUX_VIDEODEV_H
- #include <linux/videodev.h>
-+#endif
- #include <linux/videodev2.h>
- #include <errno.h>
- #include <fcntl.h>
-@@ -50,7 +52,9 @@ main (int argc, char *argv[])
- int ret = -1;
- char *udi;
- char *device_file;
-+#ifdef HAVE_LINUX_VIDEODEV_H
- struct video_capability v1cap;
-+#endif
- struct v4l2_capability v2cap;
- LibHalContext *ctx = NULL;
- LibHalChangeSet *cset;
-@@ -107,7 +111,9 @@ main (int argc, char *argv[])
- LIBHAL_FREE_DBUS_ERROR (&error);
- libhal_device_add_capability (ctx, udi, "video4linux.radio", &error);
- }
-- } else {
-+ }
-+#ifdef HAVE_LINUX_VIDEODEV_H
-+ else {
- HAL_DEBUG (("ioctl VIDIOC_QUERYCAP failed"));
-
- if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) {
-@@ -134,6 +140,7 @@ main (int argc, char *argv[])
- HAL_DEBUG (("ioctl VIDIOCGCAP failed"));
- }
- }
-+#endif
-
- LIBHAL_FREE_DBUS_ERROR (&error);
- libhal_device_commit_changeset (ctx, cset, &error);
---
-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 c655c2989..000000000
--- a/meta/recipes-support/hal/files/sg-inhibit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Upstream-Status: Pending
-
---- 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;
- }