diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-10-06 22:08:47 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-10-06 22:08:47 +0000 |
| commit | 32414dbf90932f59d745eabd64a113d941afaa35 (patch) | |
| tree | 68cf3768522c4a28c5cde6faacc3de405d745696 /packages/hal | |
| parent | 64c92768e7cee92f6ff676e22a7cde6aeb5c3322 (diff) | |
| parent | 62007cb1fac3e5a7f4a09b61c7d3c3b7cd5fc8a7 (diff) | |
merge of 'aac972a11d5683b639123784bea6534e132ad36d'
and 'd714000fc8a6b75093a93f01782724b65d31eac1'
Diffstat (limited to 'packages/hal')
| -rw-r--r-- | packages/hal/hal_0.5.9.bb | 22 |
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 |