summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky.conf4
-rw-r--r--meta/packages/hal/files/sg-inhibit.patch24
-rw-r--r--meta/packages/hal/hal_0.5.9.1.bb (renamed from meta/packages/hal/hal_0.5.9.bb)18
3 files changed, 32 insertions, 14 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 1344a4a9a..56441d431 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -111,7 +111,7 @@ SRCDATE_oh-puzzles = "20070714"
SRCDATE_libowl = "20070715"
SRCDATE_libxcalibrate = "20070607"
SRCDATE_calibrateproto = "20070607"
-SRCDATE_hal-info = "20070513"
+SRCDATE_hal-info = "20070727"
SRCDATE_gtk-theme-torturer = "20070529"
SRCDATE_libsyncml = "20070529"
SRCDATE_matchbox-applet-light = "20070529"
@@ -181,7 +181,7 @@ PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
PREFERRED_VERSION_xst ?= "0.15"
PREFERRED_VERSION_oprofile ?= "0.9.2+cvs${SRCDATE}"
PREFERRED_VERSION_elfutils ?= "0.89"
-PREFERRED_VERSION_hal ?= "0.5.9"
+PREFERRED_VERSION_hal ?= "0.5.9.1"
require conf/distro/include/preferred-xorg-versions.inc
diff --git a/meta/packages/hal/files/sg-inhibit.patch b/meta/packages/hal/files/sg-inhibit.patch
new file mode 100644
index 000000000..f0cc41448
--- /dev/null
+++ b/meta/packages/hal/files/sg-inhibit.patch
@@ -0,0 +1,24 @@
+--- 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.9.bb b/meta/packages/hal/hal_0.5.9.1.bb
index 2e8ffd96e..4e3c7ed92 100644
--- a/meta/packages/hal/hal_0.5.9.bb
+++ b/meta/packages/hal/hal_0.5.9.1.bb
@@ -3,15 +3,12 @@ HOMEPAGE = "http://freedesktop.org/Software/hal"
SECTION = "unknown"
LICENSE = "GPL LGPL AFL"
-DEPENDS = "virtual/kernel dbus-glib udev intltool expat libusb"
+DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb"
RDEPENDS += "udev hal-info"
-#RDEPENDS_hal-device-manager = "python hal python-pygnome"
RRECOMMENDS = "udev-utils"
-PR = "r1"
-
SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
- file://autoconf.diff;patch=1 \
+ file://sg-inhibit.patch;patch=1 \
file://99_hal"
S = "${WORKDIR}/hal-${PV}"
@@ -24,7 +21,9 @@ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
--with-hotplug=${sysconfdir}/hotplug.d \
--disable-docbook-docs \
--disable-policy-kit \
- --disable-acpi --disable-pmu --disable-pci \
+ --disable-acpi --disable-acpi-acpid --disable-acpi-proc \
+ --disable-sonypic \
+ --disable-pmu --disable-pci \
--disable-pci-ids --disable-pnp-ids \
"
@@ -64,12 +63,6 @@ pkg_postrm_hal () {
delgroup haldaemon || true
}
-#PACKAGES += "hal-device-manager"
-
-#FILES_hal-device-manager = " \
-# ${datadir}/hal/device-manager/ \
-# ${bindir}/hal-device-manager"
-
FILES_${PN} = "${sysconfdir} \
${bindir}/lshal \
${bindir}/hal-find-by-capability \
@@ -79,6 +72,7 @@ FILES_${PN} = "${sysconfdir} \
${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.* \