summaryrefslogtreecommitdiff
path: root/packages/hal
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-10-06 19:09:49 +0000
committerKoen Kooi <koen@openembedded.org>2007-10-06 19:09:49 +0000
commitadecb539d2fdcca398f31e7220dc15d13633994d (patch)
tree814ceca88f36ad50757bd9e341060711319f915f /packages/hal
parent3f84f7432b678ab6d503bf5c67ad9792b4c61c47 (diff)
hal: enable pci when available
Diffstat (limited to 'packages/hal')
-rw-r--r--packages/hal/hal_0.5.9.bb22
1 files changed, 11 insertions, 11 deletions
diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb
index 72d5dc4e2d..03c45623a4 100644
--- a/packages/hal/hal_0.5.9.bb
+++ b/packages/hal/hal_0.5.9.bb
@@ -5,28 +5,28 @@ RDEPENDS += "udev hal-info"
#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 \
- "
-
-# work around autoconf >2.59 deps...
-do_configure() {
- gnu-configize
- libtoolize --force
- oe_runconf
-}
+ --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)} \
+ "
+
+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