From 4fb6a9e216b856cac62d6c05ce91f8a4b6fa97eb Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Fri, 19 Jan 2007 16:01:10 +0000
Subject: Upgrade HAL to 0.5.8.1

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1168 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/hal/hal_0.5.4.bb   | 32 ------------------------
 meta/packages/hal/hal_0.5.8.1.bb | 53 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 32 deletions(-)
 delete mode 100644 meta/packages/hal/hal_0.5.4.bb
 create mode 100644 meta/packages/hal/hal_0.5.8.1.bb

(limited to 'meta/packages/hal')

diff --git a/meta/packages/hal/hal_0.5.4.bb b/meta/packages/hal/hal_0.5.4.bb
deleted file mode 100644
index 147439d4c3..0000000000
--- a/meta/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/meta/packages/hal/hal_0.5.8.1.bb b/meta/packages/hal/hal_0.5.8.1.bb
new file mode 100644
index 0000000000..4b2196f875
--- /dev/null
+++ b/meta/packages/hal/hal_0.5.8.1.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "Hardware Abstraction Layer"
+HOMEPAGE = "http://freedesktop.org/Software/hal"
+SECTION = "unknown"
+LICENSE = "GPL LGPL AFL"
+
+DEPENDS = "dbus-glib  expat libusb"
+RDEPENDS += "udev"
+#RDEPENDS_hal-device-manager = "python hal python-pygnome"
+RRECOMMENDS = "udev-utils"
+
+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 \
+                --disable-policy-kit \
+                "
+
+do_stage() {
+        autotools_stage_all
+        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_hal-device-manager = " \
+#               ${datadir}/hal/device-manager/ \
+#               ${bindir}/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* \
+                ${libdir}/hal \
+                ${libexecdir} \
+                ${datadir}/hal/fdi \
+                ${datadir}/hal/scripts"
-- 
cgit v1.2.3-54-g00ecf