summaryrefslogtreecommitdiff
path: root/packages/hal
diff options
context:
space:
mode:
Diffstat (limited to 'packages/hal')
-rw-r--r--packages/hal/files/20hal58
-rw-r--r--packages/hal/files/99_hal1
-rw-r--r--packages/hal/hal-info_git.bb20
-rw-r--r--packages/hal/hal.inc10
-rw-r--r--packages/hal/hal_0.2.98.bb16
-rw-r--r--packages/hal/hal_0.5.2.bb24
-rw-r--r--packages/hal/hal_0.5.4.bb32
-rw-r--r--packages/hal/hal_0.5.7.bb46
-rw-r--r--packages/hal/hal_0.5.9.bb (renamed from packages/hal/hal_0.5.8.1.bb)35
9 files changed, 110 insertions, 132 deletions
diff --git a/packages/hal/files/20hal b/packages/hal/files/20hal
new file mode 100644
index 0000000000..ff6ffc2b4c
--- /dev/null
+++ b/packages/hal/files/20hal
@@ -0,0 +1,58 @@
+#! /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 --oknodo --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/packages/hal/files/99_hal b/packages/hal/files/99_hal
index f3d477231e..c82da990ba 100644
--- a/packages/hal/files/99_hal
+++ b/packages/hal/files/99_hal
@@ -1 +1,2 @@
d root root 0700 /var/run/hald none
+d haldaemon haldaemon 0755 /var/cache/hald none
diff --git a/packages/hal/hal-info_git.bb b/packages/hal/hal-info_git.bb
new file mode 100644
index 0000000000..597107fe2b
--- /dev/null
+++ b/packages/hal/hal-info_git.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Hardware Abstraction Layer device information"
+HOMEPAGE = "http://freedesktop.org/Software/hal"
+SECTION = "unknown"
+LICENSE = "GPL AFL"
+
+PV = "${SRCDATE}+git"
+PR = "r1"
+
+
+SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-recall --disable-video"
+
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += "/usr/share/hal/"
diff --git a/packages/hal/hal.inc b/packages/hal/hal.inc
new file mode 100644
index 0000000000..11a6531951
--- /dev/null
+++ b/packages/hal/hal.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "Hardware Abstraction Layer"
+HOMEPAGE = "http://freedesktop.org/Software/hal"
+SECTION = "unknown"
+LICENSE = "GPL LGPL AFL"
+
+SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz"
+
+S = "${WORKDIR}/hal-${PV}"
+
+inherit autotools pkgconfig
diff --git a/packages/hal/hal_0.2.98.bb b/packages/hal/hal_0.2.98.bb
deleted file mode 100644
index 7c8b8b73eb..0000000000
--- a/packages/hal/hal_0.2.98.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SECTION = "unknown"
-DESCRIPTION = "Hardware Abstraction Layer"
-DEPENDS = "dbus expat"
-RDEPENDS += "hotplug"
-HOMEPAGE = "http://freedesktop.org/Software/hal"
-LICENSE = "GPL LGPL AFL"
-
-SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz"
-S = "${WORKDIR}/hal-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
- --with-expat=${STAGING_LIBDIR}/.. \
- --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
- --with-hotplug=${sysconfdir}/hotplug.d"
diff --git a/packages/hal/hal_0.5.2.bb b/packages/hal/hal_0.5.2.bb
deleted file mode 100644
index fd29980e56..0000000000
--- a/packages/hal/hal_0.5.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SECTION = "unknown"
-DESCRIPTION = "Hardware Abstraction Layer"
-DEPENDS = "dbus expat"
-RDEPENDS += "hotplug"
-RRECOMMENDS = "udev-utils"
-HOMEPAGE = "http://freedesktop.org/Software/hal"
-LICENSE = "GPL LGPL AFL"
-
-SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz"
-S = "${WORKDIR}/hal-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
- --with-expat=${STAGING_LIBDIR}/.. \
- --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
- --with-hotplug=${sysconfdir}/hotplug.d"
-
-do_stage() {
- autotools_stage_includes
- 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
-}
diff --git a/packages/hal/hal_0.5.4.bb b/packages/hal/hal_0.5.4.bb
deleted file mode 100644
index 147439d4c3..0000000000
--- a/packages/hal/hal_0.5.4.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SECTION = "unknown"
-DESCRIPTION = "Hardware Abstraction Layer"
-DEPENDS = "dbus expat libusb"
-RDEPENDS += "hotplug"
-RDEPENDS_hal-device-manager = "python hal python-pygnome"
-RRECOMMENDS = "udev-utils"
-HOMEPAGE = "http://freedesktop.org/Software/hal"
-LICENSE = "GPL LGPL AFL"
-PR = "r1"
-
-SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz"
-S = "${WORKDIR}/hal-${PV}"
-
-inherit autotools pkgconfig
-
-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"
-
-do_stage() {
- autotools_stage_includes
- 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
-}
-
-PACKAGES += "hal-device-manager"
-FILES_${PN} = "${sysconfdir} ${bindir}/lshal ${bindir}/hal-get-property ${bindir}/hal-set-property ${sbindir} ${libdir}/libhal.so* ${libdir}/libhal-storage.so* ${libexecdir} ${datadir}/hal/fdi"
-FILES_hal-device-manager = "${datadir}/hal/device-manager/ ${bindir}/hal-device-manager"
-
diff --git a/packages/hal/hal_0.5.7.bb b/packages/hal/hal_0.5.7.bb
deleted file mode 100644
index 5933676260..0000000000
--- a/packages/hal/hal_0.5.7.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-DESCRIPTION = "Hardware Abstraction Layer"
-HOMEPAGE = "http://freedesktop.org/Software/hal"
-SECTION = "unknown"
-LICENSE = "GPL LGPL AFL"
-DEPENDS = "dbus expat libusb"
-RDEPENDS += "hotplug"
-#RDEPENDS_hal-device-manager = "python hal python-pygnome"
-RRECOMMENDS = "udev-utils"
-
-SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
- file://dbus-fix-api.patch;patch=1"
-S = "${WORKDIR}/hal-${PV}"
-
-inherit autotools pkgconfig
-
-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"
-
-do_stage() {
- autotools_stage_includes
- 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
-}
-
-#PACKAGES += "hal-device-manager"
-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 \
- ${sbindir} \
- ${libdir}/libhal.so* \
- ${libdir}/libhal-storage.so* \
- ${libexecdir} \
- ${datadir}/hal/fdi \
- ${datadir}/hal/scripts"
-#FILES_hal-device-manager = " \
-# ${datadir}/hal/device-manager/ \
-# ${bindir}/hal-device-manager"
-
diff --git a/packages/hal/hal_0.5.8.1.bb b/packages/hal/hal_0.5.9.bb
index f608c4018c..72d5dc4e2d 100644
--- a/packages/hal/hal_0.5.8.1.bb
+++ b/packages/hal/hal_0.5.9.bb
@@ -1,21 +1,15 @@
-DESCRIPTION = "Hardware Abstraction Layer"
-HOMEPAGE = "http://freedesktop.org/Software/hal"
-SECTION = "unknown"
-LICENSE = "GPL LGPL AFL"
+require hal.inc
-DEPENDS = "dbus-glib udev intltool expat libusb"
-RDEPENDS += "udev"
+DEPENDS = "virtual/kernel dbus-glib udev intltool expat libusb"
+RDEPENDS += "udev hal-info"
#RDEPENDS_hal-device-manager = "python hal python-pygnome"
RRECOMMENDS = "udev-utils"
PR = "r2"
-SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
- file://99_hal"
-
-S = "${WORKDIR}/hal-${PV}"
-
-inherit autotools pkgconfig
+SRC_URI += "file://99_hal \
+ file://20hal \
+ "
EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
--with-expat=${STAGING_LIBDIR}/.. \
@@ -23,11 +17,22 @@ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
--with-hotplug=${sysconfdir}/hotplug.d \
--disable-docbook-docs \
--disable-policy-kit \
+ --disable-acpi --disable-pmu --disable-pci \
+ --disable-pci-ids --disable-pnp-ids \
"
+# work around autoconf >2.59 deps...
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
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() {
@@ -74,9 +79,11 @@ FILES_${PN} = "${sysconfdir} \
${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}/libhal.so.* \
+ ${libdir}/libhal-storage.so.* \
${libdir}/hal \
${libexecdir} \
${datadir}/hal/fdi \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 18:41:02 +0000