summaryrefslogtreecommitdiff
path: root/meta/packages/hal
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/hal')
-rwxr-xr-xmeta/packages/hal/files/20hal58
-rw-r--r--meta/packages/hal/files/99_hal2
-rw-r--r--meta/packages/hal/files/autoconf.diff11
-rw-r--r--meta/packages/hal/files/hal-right-input-h.patch29
-rw-r--r--meta/packages/hal/files/sg-inhibit.patch24
-rw-r--r--meta/packages/hal/hal-0.5.11+0.5.12rc1/fix-configure.diff22
-rw-r--r--meta/packages/hal/hal-info.inc20
-rw-r--r--meta/packages/hal/hal-info_20090414.bb1
-rw-r--r--meta/packages/hal/hal-info_git.bb23
-rw-r--r--meta/packages/hal/hal.inc94
-rw-r--r--meta/packages/hal/hal/configure_fix.patch60
-rw-r--r--meta/packages/hal/hal_0.5.11+0.5.12rc1.bb19
-rw-r--r--meta/packages/hal/hal_git.bb87
13 files changed, 0 insertions, 450 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/99_hal b/meta/packages/hal/files/99_hal
deleted file mode 100644
index c82da990b..000000000
--- a/meta/packages/hal/files/99_hal
+++ /dev/null
@@ -1,2 +0,0 @@
-d root root 0700 /var/run/hald none
-d haldaemon haldaemon 0755 /var/cache/hald none
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;
- }
diff --git a/meta/packages/hal/hal-0.5.11+0.5.12rc1/fix-configure.diff b/meta/packages/hal/hal-0.5.11+0.5.12rc1/fix-configure.diff
deleted file mode 100644
index 7d9d42d69..000000000
--- a/meta/packages/hal/hal-0.5.11+0.5.12rc1/fix-configure.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Rémi Cardona <remi@gentoo.org>
-Date: Sat, 9 Aug 2008 15:04:07 +0000 (+0200)
-Subject: add libtool-2.2 support
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c8a1aedf87bbb200fc5daa0ec8559a2d84fbb61d
-
-add libtool-2.2 support
-
-Fix for aclocal to work properly with libtool 2.2 which no longer
-checks for C++ automatically (this patch is of course backwards
-compatible with libtool 1.5.x)
----
-
---- a/configure.in
-+++ b/configure.in
-@@ -29,6 +29,7 @@ AC_SUBST(LT_AGE)
-
- AC_ISC_POSIX
- AC_PROG_CC
-+AC_PROG_CXX
- AM_PROG_CC_C_O
- AC_HEADER_STDC
- AC_PROG_LIBTOOL
diff --git a/meta/packages/hal/hal-info.inc b/meta/packages/hal/hal-info.inc
deleted file mode 100644
index 635fd0aa4..000000000
--- a/meta/packages/hal/hal-info.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Hardware Abstraction Layer device information"
-HOMEPAGE = "http://hal.freedesktop.org/"
-SECTION = "unknown"
-LICENSE = "GPL AFL"
-
-SRC_URI = "http://hal.freedesktop.org/releases/${PN}-${PV}.tar.gz"
-S = "${WORKDIR}/${PN}-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-recall --disable-video"
-
-do_configure() {
- gnu-configize
- libtoolize --force
- oe_runconf
-}
-
-PACKAGE_ARCH = "all"
-FILES_${PN} += "${datadir}/hal/"
diff --git a/meta/packages/hal/hal-info_20090414.bb b/meta/packages/hal/hal-info_20090414.bb
deleted file mode 100644
index e6d50e398..000000000
--- a/meta/packages/hal/hal-info_20090414.bb
+++ /dev/null
@@ -1 +0,0 @@
-require hal-info.inc
diff --git a/meta/packages/hal/hal-info_git.bb b/meta/packages/hal/hal-info_git.bb
deleted file mode 100644
index 0cb44706f..000000000
--- a/meta/packages/hal/hal-info_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Hardware Abstraction Layer device information"
-HOMEPAGE = "http://freedesktop.org/Software/hal"
-SECTION = "unknown"
-LICENSE = "GPL AFL"
-
-PV = "${SRCDATE}+git"
-PR = "r2"
-
-
-SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git;rev=HAL_INFO_20070831"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-recall --disable-video"
-
-
-PACKAGE_ARCH = "all"
-FILES_${PN} += "/usr/share/hal/"
-
-# By default, use the released hal-info
-DEFAULT_PREFERENCE = "-1"
diff --git a/meta/packages/hal/hal.inc b/meta/packages/hal/hal.inc
deleted file mode 100644
index d0c74e84a..000000000
--- a/meta/packages/hal/hal.inc
+++ /dev/null
@@ -1,94 +0,0 @@
-DESCRIPTION = "Hardware Abstraction Layer"
-HOMEPAGE = "http://freedesktop.org/Software/hal"
-SECTION = "unknown"
-LICENSE = "GPL LGPL AFL"
-
-SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz"
-
-S = "${WORKDIR}/hal-${PV}"
-
-inherit autotools pkgconfig
-
-DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb gperf-native"
-RDEPENDS += "udev hal-info"
-RRECOMMENDS = "udev-utils"
-
-SRC_URI += "file://99_hal \
- file://20hal \
- "
-
-LEAD_SONAME = "libhal.so"
-
-# machines with pci and acpi get a machine dependant hal
-EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
- --with-expat=${STAGING_LIBDIR}/.. \
- --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
- --with-hotplug=${sysconfdir}/hotplug.d \
- --disable-docbook-docs \
- --disable-policy-kit \
- --disable-pmu \
- --disable-pnp-ids \
- ${@base_contains('COMBINED_FEATURES', 'pci', '--enable-pci --enable-pci-ids', '--disable-pci --disable-pci-ids',d)} \
- ${@base_contains('MACHINE_FEATURES', 'acpi', '--enable-acpi', '--disable-acpi',d)} \
- "
-
-MY_ARCH := "${PACKAGE_ARCH}"
-PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'acpi', '${MACHINE_ARCH}', '${MY_ARCH}',d)}"
-PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}',d)}"
-
-do_install_append() {
- install -d ${D}/etc/default/volatiles
- install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles
- install -d ${D}/etc/dbus-1/event.d
- install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d
-}
-
-do_stage() {
- oe_libinstall -C libhal -a -so libhal ${STAGING_LIBDIR}
- oe_libinstall -C libhal-storage -a -so libhal-storage ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/hal
- install -m 0644 libhal/libhal.h ${STAGING_INCDIR}/hal
- install -m 0644 libhal-storage/libhal-storage.h ${STAGING_INCDIR}/hal
-}
-
-# At the time the postinst runs, dbus might not be setup so only restart if running
-pkg_postinst_hal () {
- # can't do this offline
- if [ "x$D" != "x" ]; then
- exit 1
- fi
-
- grep haldaemon /etc/group || addgroup haldaemon
- grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL
-
- /etc/init.d/populate-volatile.sh update
-
- DBUSPID=`pidof dbus-daemon`
-
- if [ "x$DBUSPID" != "x" ]; then
- /etc/init.d/dbus-1 force-reload
- fi
-}
-
-pkg_postrm_hal () {
- deluser haldaemon || true
- delgroup haldaemon || true
-}
-
-FILES_${PN} = "${sysconfdir} \
- ${bindir}/lshal \
- ${bindir}/hal-find-by-capability \
- ${bindir}/hal-find-by-property \
- ${bindir}/hal-device \
- ${bindir}/hal-get-property \
- ${bindir}/hal-set-property \
- ${bindir}/hal-lock \
- ${bindir}/hal-is-caller-locked-out \
- ${sbindir} \
- ${libdir}/libhal.so.* \
- ${libdir}/libhal-storage.so.* \
- ${libdir}/hal \
- ${libexecdir} \
- ${datadir}/hal/fdi \
- ${datadir}/hal/scripts"
diff --git a/meta/packages/hal/hal/configure_fix.patch b/meta/packages/hal/hal/configure_fix.patch
deleted file mode 100644
index e8417040d..000000000
--- a/meta/packages/hal/hal/configure_fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-The AC_LANG sections upset libtool 2.2.2, as do .cpp files without a call
-to AC_PROG_CXX. Easiest solution is to patch this out for now.
-
-RP - 14/4/08
-
-Index: hal-0.5.9.1/configure.in
-===================================================================
---- hal-0.5.9.1.orig/configure.in 2008-04-14 22:41:49.000000000 +0100
-+++ hal-0.5.9.1/configure.in 2008-04-14 22:43:13.000000000 +0100
-@@ -345,32 +345,8 @@
- fi
-
- dnl Check for libsmbios
--AC_LANG_PUSH([C++])
--AC_CHECK_LIB(smbios, SMBIOSFreeMemory, LIB_SMBIOS=yes , LIB_SMBIOS=no )
--AC_LANG_POP([C++])
--if test "$LIB_SMBIOS" = "yes" ; then
-- AC_MSG_CHECKING([for libsmbios >= 0.13.4])
-- AC_TRY_RUN(
-- #include <smbios/version.h>
-- int main ()
-- {
-- int major ;
-- int minor ;
-- int micro ;
--
-- if ( sscanf( LIBSMBIOS_RELEASE_VERSION , "%d.%d.%d", &major, &minor, &micro ) == 3 ) {
-- if ((major == 0 && minor == 13 && micro >= 4) ||
-- (major >= 0 && minor > 13)) {
-- return 0;
-- }
-- }
-- return 1;
-- } , [USE_SMBIOS=yes; AC_MSG_RESULT(yes); AM_CONDITIONAL(HAVE_SMBIOS,true)],
-- [USE_SMBIOS=no; AC_MSG_RESULT(failed); AM_CONDITIONAL(HAVE_SMBIOS,false)])
--else
-- USE_SMBIOS=no
-- AM_CONDITIONAL(HAVE_SMBIOS,false)
--fi
-+USE_SMBIOS=no
-+AM_CONDITIONAL(HAVE_SMBIOS,false)
-
- AC_ARG_WITH([libpci],
- [AS_HELP_STRING([--without-libpci],
-Index: hal-0.5.9.1/hald/linux/addons/Makefile.am
-===================================================================
---- hal-0.5.9.1.orig/hald/linux/addons/Makefile.am 2008-04-14 22:45:18.000000000 +0100
-+++ hal-0.5.9.1/hald/linux/addons/Makefile.am 2008-04-14 22:46:05.000000000 +0100
-@@ -60,11 +60,6 @@
- hald_addon_usb_csr_LDADD = $(top_builddir)/libhal/libhal.la -lusb @GLIB_LIBS@
- endif
-
--if BUILD_DELL
--libexec_PROGRAMS += hald-addon-dell-backlight
--hald_addon_dell_backlight_SOURCES = addon-dell-backlight.cpp ../../logger.c
--hald_addon_dell_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lsmbios @GLIB_LIBS@
--endif
- endif
-
- hald_addon_acpi_SOURCES = addon-acpi.c ../../logger.c ../../util_helper.c
diff --git a/meta/packages/hal/hal_0.5.11+0.5.12rc1.bb b/meta/packages/hal/hal_0.5.11+0.5.12rc1.bb
deleted file mode 100644
index 1d4ca592a..000000000
--- a/meta/packages/hal/hal_0.5.11+0.5.12rc1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require hal.inc
-
-PR = "r1"
-
-SRC_URI = "http://hal.freedesktop.org/releases/hal-0.5.12rc1.tar.gz \
- file://99_hal \
- file://20hal"
-
-S = "${WORKDIR}/hal-0.5.12rc1"
-
-EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
-
-PACKAGES =+ "libhal libhal-storage"
-
-FILES_libhal = "${libdir}/libhal.so.*"
-FILES_libhal-storage = "${libdir}/libhal-storage.so.*"
-
-FILES_${PN} =+ "${bindir}/hal-disable-polling \
- ${bindir}/hal-setup-keymap"
diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb
deleted file mode 100644
index 44be44f98..000000000
--- a/meta/packages/hal/hal_git.bb
+++ /dev/null
@@ -1,87 +0,0 @@
-DESCRIPTION = "Hardware Abstraction Layer"
-HOMEPAGE = "http://freedesktop.org/Software/hal"
-SECTION = "unknown"
-LICENSE = "GPL LGPL AFL"
-
-DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb"
-RDEPENDS_${PN} += "udev hal-info"
-RRECOMMENDS_${PN} += "udev-utils"
-
-SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
- file://20hal \
- file://99_hal"
-
-PV = "0.5.9.1+git${SRCDATE}"
-PR = "r4"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
- --with-expat=${STAGING_DIR_HOST}${layout_prefix} \
- --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
- --with-hotplug=${sysconfdir}/hotplug.d \
- --disable-docbook-docs \
- --disable-policy-kit \
- --disable-acpi --disable-acpi-acpid --disable-acpi-proc \
- --disable-sonypic \
- --disable-pmu --disable-pci \
- --disable-pci-ids --disable-pnp-ids \
- "
-
-do_install_append() {
- install -d ${D}/etc/default/volatiles
- install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles
- install -d ${D}/etc/dbus-1/event.d
- install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d
-}
-
-do_stage() {
- autotools_stage_all
- install -d ${STAGING_LIBDIR}
- install -m 755 libhal/.libs/libhal.so.1.0.0 ${STAGING_LIBDIR}/libhal.so
- install -m 755 libhal-storage/.libs/libhal-storage.so.1.0.0 ${STAGING_LIBDIR}/libhal-storage.so
-}
-
-# At the time the postinst runs, dbus might not be setup so only restart if running
-pkg_postinst_hal () {
- # can't do this offline
- if [ "x$D" != "x" ]; then
- exit 1
- fi
-
- /etc/init.d/populate-volatile.sh update
-
- grep haldaemon /etc/group || addgroup haldaemon
- grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL
-
- DBUSPID=`pidof dbus-daemon`
-
- if [ "x$DBUSPID" != "x" ]; then
- /etc/init.d/dbus-1 reload
- fi
-}
-
-pkg_postrm_hal () {
- deluser haldaemon || true
- delgroup haldaemon || true
-}
-
-FILES_${PN} = "${sysconfdir} \
- ${bindir}/lshal \
- ${bindir}/hal-find-by-capability \
- ${bindir}/hal-find-by-property \
- ${bindir}/hal-device \
- ${bindir}/hal-get-property \
- ${bindir}/hal-set-property \
- ${bindir}/hal-lock \
- ${bindir}/hal-is-caller-locked-out \
- ${bindir}/hal-disable-polling \
- ${sbindir} \
- ${libdir}/libhal.so.* \
- ${libdir}/libhal-storage.so.* \
- ${libdir}/hal \
- ${libexecdir} \
- ${datadir}/hal/fdi \
- ${datadir}/hal/scripts"
generated by cgit v1.2.3 (git 2.51.0) at 2026-03-19 18:11:36 +0000