6 files changed, 11 insertions, 132 deletions

diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index f7e64d7b22..630427059a 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -24,7 +24,7 @@ PREFERRED_VERSION_evince ?= "2.20.0"
 PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}"
 PREFERRED_VERSION_oprofile ?= "0.9.6"
 PREFERRED_VERSION_elfutils ?= "0.89"
-PREFERRED_VERSION_hal ?= "0.5.13"
+PREFERRED_VERSION_hal ?= "0.5.14"
 PREFERRED_VERSION_hal-info ?= "20090414"
 PREFERRED_VERSION_udev ?= "141"
 
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 7d9d42d69f..0000000000
--- 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.inc b/meta/packages/hal/hal.inc
index 2b70eb714d..cacc67bd16 100644
--- a/meta/packages/hal/hal.inc
+++ b/meta/packages/hal/hal.inc
@@ -4,17 +4,14 @@ 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 intltool intltool-native expat libusb gperf-native"
+DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native"
 RDEPENDS += "udev hal-info"
-RRECOMMENDS = "udev-utils"
 
-SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz"
-SRC_URI += "file://99_hal \
-            file://20hal \
-           "
-
-S = "${WORKDIR}/hal-${PV}"
+SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \
+           file://99_hal \
+           file://20hal"
 
 inherit autotools pkgconfig
 
diff --git a/meta/packages/hal/hal_0.5.13.bb b/meta/packages/hal/hal_0.5.13.bb
deleted file mode 100644
index dde33fabbf..0000000000
--- a/meta/packages/hal/hal_0.5.13.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require hal.inc
-
-PR = "r3"
-
-SRC_URI = "http://hal.freedesktop.org/releases/hal-0.5.13.tar.gz \
-           file://99_hal \
-           file://20hal"
-
-S = "${WORKDIR}/hal-0.5.13"
-
-EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
-
-PACKAGES =+ "libhal libhal-storage"
-
-DEPENDS += "util-linux"
-
-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_0.5.11+0.5.12rc1.bb b/meta/packages/hal/hal_0.5.14.bb
index f9b4f2cb7d..4981c84c49 100644
--- a/meta/packages/hal/hal_0.5.11+0.5.12rc1.bb
+++ b/meta/packages/hal/hal_0.5.14.bb
@@ -1,14 +1,9 @@
 require hal.inc
 
-PR = "r2"
-
-SRC_URI = "http://hal.freedesktop.org/releases/hal-0.5.12rc1.tar.gz \
-           file://99_hal \
-           file://20hal"
-
-S = "${WORKDIR}/hal-0.5.12rc1"
+PR = "r0"
 
 EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
+EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'"
 
 PACKAGES =+ "libhal libhal-storage"
 
diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb
index 85bb777d5f..34ccfe9cf2 100644
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/packages/hal/hal_git.bb
@@ -1,16 +1,7 @@
-DESCRIPTION = "Hardware Abstraction Layer"
-HOMEPAGE = "http://freedesktop.org/Software/hal"
-BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=hal"
-SECTION = "unknown"
-
-LICENSE = "GPLv2+ | AFL"
-
-DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb"
-RDEPENDS_${PN} += "udev hal-info"
-RRECOMMENDS_${PN} += "udev-utils"
+require hal.inc
 
 PV = "0.5.9.1+git${SRCDATE}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
         file://20hal \
@@ -18,65 +9,4 @@ SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
 
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
-                --with-expat=${STAGING_DIR_HOST}${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
-}
-
-# 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"
+DEFAULT_PREFERENCE = "-1"