9 files changed, 73 insertions, 32 deletions
diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc
index dd2703d36c..d9fe3bef4f 100644
--- a/packages/gcc/gcc-package-cross.inc
+++ b/packages/gcc/gcc-package-cross.inc
@@ -6,17 +6,9 @@ HAS_GFORTRAN ?= "no"
 OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = "1"
 
-#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
-MY_ARCH := "${PACKAGE_ARCH}"
-
 PACKAGES = "libgcc libgcc-dev libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev"
 PACKAGES_DYNAMIC = "libgcc* libstdc* libg2c* libgfortran*"
 
-PACKAGE_ARCH_libg2c = "${MY_ARCH}"
-PACKAGE_ARCH_libg2c-dev = "${MY_ARCH}"
-PACKAGE_ARCH_libgfortran = "${MY_ARCH}"
-PACKAGE_ARCH_libgfortran-dev = "${MY_ARCH}"
-
 # Called from within gcc-cross, so libdir is set wrong
 FILES_libg2c = "${target_libdir}/libg2c.so.*"
 FILES_libg2c-dev = "${target_libdir}/libg2c.so \
@@ -28,13 +20,9 @@ FILES_libgfortran-dev = "${target_libdir}/libgfortran.a \
 			 ${target_libdir}/libgfortran.so \
 			 ${target_libdir}/libgfortranbegin.a"
 
-PACKAGE_ARCH_libgcc = "${MY_ARCH}"
-PACKAGE_ARCH_libgcc-dev = "${MY_ARCH}"
 FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
 FILES_libgcc-dev = "${target_base_libdir}/libgcc_s.so"
 
-PACKAGE_ARCH_libstdc++ = "${MY_ARCH}"
-PACKAGE_ARCH_libstdc++-dev = "${MY_ARCH}"
 FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
 FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \
 		       ${target_libdir}/libstdc++.so \
diff --git a/packages/hal/hal_0.5.7.bb b/packages/hal/hal_0.5.7.bb
index 6139203f10..c6ca7f75dc 100644
--- a/packages/hal/hal_0.5.7.bb
+++ b/packages/hal/hal_0.5.7.bb
@@ -2,7 +2,7 @@ SECTION = "unknown"
 DESCRIPTION = "Hardware Abstraction Layer"
 DEPENDS = "dbus expat libusb"
 RDEPENDS += "hotplug"
-RDEPENDS_hal-device-manager = "python hal python-pygnome"
+#RDEPENDS_hal-device-manager = "python hal python-pygnome"
 RRECOMMENDS = "udev-utils"
 HOMEPAGE = "http://freedesktop.org/Software/hal"
 LICENSE = "GPL LGPL AFL"
@@ -27,7 +27,7 @@ do_stage() {
 	install -m 755 libhal-storage/.libs/libhal-storage.so.1.0.0 ${STAGING_LIBDIR}/libhal-storage.so
 }
 
-PACKAGES += "hal-device-manager"
+#PACKAGES += "hal-device-manager"
 FILES_${PN} =  "${sysconfdir} \
 		${bindir}/lshal \
 		${bindir}/hal-find-by-capability \
@@ -41,7 +41,7 @@ FILES_${PN} =  "${sysconfdir} \
 		${libexecdir} \
 		${datadir}/hal/fdi \
 		${datadir}/hal/scripts"
-FILES_hal-device-manager = " \
-		${datadir}/hal/device-manager/ \
-		${bindir}/hal-device-manager"
+#FILES_hal-device-manager = " \
+#		${datadir}/hal/device-manager/ \
+#		${bindir}/hal-device-manager"
 
diff --git a/packages/hal/hal_0.5.8.1.bb b/packages/hal/hal_0.5.8.1.bb
new file mode 100644
index 0000000000..edfac3c489
--- /dev/null
+++ b/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 hal-info"
+
+PR = "r0"
+
+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"
diff --git a/packages/python/python-pygtk2_2.10.0.bb b/packages/python/python-pygtk2_2.10.3.bb
index 1af24b410d..1af24b410d 100644
--- a/packages/python/python-pygtk2_2.10.0.bb
+++ b/packages/python/python-pygtk2_2.10.3.bb
diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index 5245d6e2b3..32b9b28784 100644
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -14,10 +14,14 @@ SRC_URI += " \
 
 UDEV_DEVFS_RULES ?= "0"
 
-PACKAGES =+ "udev-utils"
+PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
+PKG_libvolume-id-dev = "libvolume-id-dev"
+
+FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
 FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
+FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
 
-inherit update-rc.d
+inherit update-rc.d autotools pkgconfig
 
 INITSCRIPT_NAME = "udev"
 INITSCRIPT_PARAMS = "start 04 S ."
@@ -60,3 +64,7 @@ do_install () {
 	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
 	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
 }
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb
index 3d33938fb1..7954376d08 100644
--- a/packages/udev/udev_092.bb
+++ b/packages/udev/udev_092.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES = "hotplug"
 
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
@@ -24,7 +24,7 @@ INITSCRIPT_PARAMS = "start 03 S ."
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
-EXTRA_OEMAKE += "libudevdir=/lib/udev"
+EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
 
 do_install () {
 	install -d ${D}${usrsbindir} \
diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb
index 497357775e..79ea7b06de 100644
--- a/packages/udev/udev_097.bb
+++ b/packages/udev/udev_097.bb
@@ -8,7 +8,7 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
@@ -23,10 +23,6 @@ PACKAGE_ARCH_h2200 = "h2200"
 
 INITSCRIPT_PARAMS = "start 03 S ."
 
-PACKAGES =+ "libvolume-id-dev libvolume-id"
-PKG_libvolume-id-dev = "libvolume-id-dev"
-FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
-FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb
index 183d785627..b17f852c64 100644
--- a/packages/udev/udev_100.bb
+++ b/packages/udev/udev_100.bb
@@ -9,7 +9,7 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
@@ -24,10 +24,6 @@ PACKAGE_ARCH_h2200 = "h2200"
 
 INITSCRIPT_PARAMS = "start 03 S ."
 
-PACKAGES =+ "libvolume-id-dev libvolume-id"
-PKG_libvolume-id-dev = "libvolume-id-dev"
-FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
-FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
index 51eb7a67c7..c3fb8f8767 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
@@ -6,7 +6,7 @@ DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",
 
 #we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
 MY_ARCH := "${PACKAGE_ARCH}"
-PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE}', '${MY_ARCH}', d)}"
+PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"
 
 DEFAULT_PREFERENCE = "-2"