[oe-commits] org.oe.dev hal: enable pci when available

[koen commit]

hal: enable pci when available

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 2cffc57d52392fbeabd7156350a781b1a803493e
ViewMTN: http://monotone.openembedded.org/revision/info/2cffc57d52392fbeabd7156350a781b1a803493e
Files:
1
packages/hal/hal_0.5.9.bb
Diffs:

#
# mt diff -rac39391bb7e64aa48f58a13b7174c19918cec7d8 -r2cffc57d52392fbeabd7156350a781b1a803493e
#
# 
# 
# patch "packages/hal/hal_0.5.9.bb"
#  from [212571a9152068eeb0f89ea9731dbf0378ecd1b0]
#    to [2755b9938bea086e274d62d986064902f8cd8562]
# 
============================================================
--- packages/hal/hal_0.5.9.bb	212571a9152068eeb0f89ea9731dbf0378ecd1b0
+++ packages/hal/hal_0.5.9.bb	2755b9938bea086e274d62d986064902f8cd8562
@@ -5,28 +5,28 @@ RRECOMMENDS = "udev-utils"
 #RDEPENDS_hal-device-manager = "python hal python-pygnome"
 RRECOMMENDS = "udev-utils"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://99_hal \
             file://20hal \
 	   "
 
+# machines with pci and acpi get a machine dependant hal
 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 \
-                --disable-acpi --disable-pmu --disable-pci \
-                --disable-pci-ids --disable-pnp-ids \
-                "
+                --disable-pmu \
+                --disable-pnp-ids \
+                ${@base_contains('COMBINED_FEATURES', 'pci', '--enable-pci --enable-pci-ids', '--disable-pci --disable-pci-ids',d)} \
+                ${@base_contains('MACHINE_FEATURES', 'acpi', '--enable-acpi', '--disable-acpi',d)} \
+               "
 
-# work around autoconf >2.59 deps...
-do_configure() {
-	gnu-configize
-	libtoolize --force
-	oe_runconf
-}
+MY_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'acpi', '${MACHINE_ARCH}', '${MY_ARCH}',d)}"
+PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}',d)}"
 
 do_install_append() {
 	install -d ${D}/etc/default/volatiles