Sync hal-git with 0.5.9.1, should work

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2356 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 6 insertions, 9 deletions

diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb
index 976131e85f..63e421efa4 100644
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/packages/hal/hal_git.bb
@@ -5,13 +5,13 @@ LICENSE = "GPL LGPL AFL"
 
 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"
 
 SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
+        file://sg-inhibit.patch;patch=1 \
         file://99_hal"
 
-PV = "0.5.9+git${SRCDATE}"
+PV = "0.5.9.1+git${SRCDATE}"
 PR = "r2"
 
 S = "${WORKDIR}/git"
@@ -24,7 +24,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 +66,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 +75,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.* \