summaryrefslogtreecommitdiff
path: root/packages/hal/hal_0.5.9.bb
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-10-06 21:42:58 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-10-06 21:42:58 +0000
commit62007cb1fac3e5a7f4a09b61c7d3c3b7cd5fc8a7 (patch)
tree24c8a0982ffb9d6339ccae067f8310bd4dc9dae0 /packages/hal/hal_0.5.9.bb
parentb4c25abff2ced8801f5b09c6b2be26ce672e323a (diff)
parent8acf0bf20e7d1f4fb89de4df260fb7b4c83cb9d5 (diff)
merge of '66f82280631349e663f6931936195ed1819fcd86'
and 'cfa480548db7b937e5fa73d80a37819a7c48609c'
Diffstat (limited to 'packages/hal/hal_0.5.9.bb')
-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