mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-10 02:33:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

hal/hal-info: This is unsed in OE-Core and deprecated, drop

Browse Source 
(From OE-Core rev: 72c010af2c0fe967a5cacc7fbdba75c3ea3e5c3a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-10-07 10:53:06 +01:00
parent b04b8a4e4d
commit 2cf9fb4df4
12 changed files with 0 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
meta/recipes-support/hal/files/20hal
View File

@@ -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

13
meta/recipes-support/hal/files/autoconf.diff
View File

@@ -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)

31
meta/recipes-support/hal/files/hal-right-input-h.patch
View File

@@ -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

60
meta/recipes-support/hal/files/probe-video4linux.c.patch
View File

@@ -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

26
meta/recipes-support/hal/files/sg-inhibit.patch
View File

@@ -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;
}

21
meta/recipes-support/hal/hal-info.inc
View File

@@ -1,21 +0,0 @@
DESCRIPTION = "Hardware Abstraction Layer device information"
HOMEPAGE = "http://hal.freedesktop.org/"
BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=hal"
SECTION = "unknown"
LICENSE = "GPLv2 | AFL"
LIC_FILES_CHKSUM = "file://COPYING;md5=ae484909bad0cf11c8e2071cee6bd4dc"
SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz"
inherit autotools pkgconfig
EXTRA_OECONF = "--disable-recall --disable-video"
do_configure() {
gnu-configize
libtoolize --force
oe_runconf
}
FILES_${PN} += "${datadir}/hal/"

6
meta/recipes-support/hal/hal-info_20091130.bb
View File

@@ -1,6 +0,0 @@
require hal-info.inc
PR = "r1"
SRC_URI[md5sum] = "34375489a02a00b250fdc0b280be11b8"
SRC_URI[sha256sum] = "3b5a90eaea4359977d36c808a19b3f08835345a258c68b9c6c080ad5ef875224"

9
meta/recipes-support/hal/hal-info_git.bb
View File

@@ -1,9 +0,0 @@
require hal-info.inc
PV = "${SRCDATE}+git"
PR = "r1"
SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git;rev=HAL_INFO_20091130"
S = "${WORKDIR}/git"
DEFAULT_PREFERENCE = "-1"

83
meta/recipes-support/hal/hal.inc
View File

@@ -1,83 +0,0 @@
DESCRIPTION = "Hardware Abstraction Layer"
HOMEPAGE = "http://freedesktop.org/Software/hal"
BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=hal"
SECTION = "unknown"
LICENSE = "GPLv2+ | AFL"
LIC_FILES_CHKSUM = "file://COPYING;md5=5b5ffd59fbb7c2fff6de76c94177af31"
DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native"
RDEPENDS_${PN} += "udev hal-info"
SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \
file://20hal"
inherit autotools pkgconfig
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)} \
"
PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'acpi', '${MACHINE_ARCH}', '${TUNE_PKGARCH}',d)}"
PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '${TUNE_PKGARCH}',d)}"
do_install_append() {
install -d ${D}/etc/dbus-1/event.d
install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d
}
# 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
# add volatile after new user/grp are created
echo "d root root 0700 /var/run/hald none" > /etc/default/volatiles/99_hal
echo "d haldaemon haldaemon 0755 /var/cache/hald none" >> /etc/default/volatiles/99_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"

62
meta/recipes-support/hal/hal/configure_fix.patch
View File

@@ -1,62 +0,0 @@
Upstream-Status: Inappropriate [configuration]
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

19
meta/recipes-support/hal/hal_0.5.14.bb
View File

@@ -1,19 +0,0 @@
require hal.inc
PR = "r5"
EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'"
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"
SRC_URI[md5sum] = "e9163df591a6f38f59fdbfe33e73bf20"
SRC_URI[sha256sum] = "323aacfa52f12def3b0d1e76456e34f027c345adc344aad19a8cc0c59c1a8d02"
SRC_URI += "file://probe-video4linux.c.patch"

12
meta/recipes-support/hal/hal_git.bb
View File

@@ -1,12 +0,0 @@
require hal.inc
PV = "0.5.9.1+git${SRCDATE}"
PR = "r9"
SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
file://20hal \
file://99_hal"
S = "${WORKDIR}/git"
DEFAULT_PREFERENCE = "-1"