diff options
Diffstat (limited to 'packages/hal')
| -rw-r--r-- | packages/hal/hal-info_20070618.bb | 20 | ||||
| -rw-r--r-- | packages/hal/hal-info_git.bb | 3 | ||||
| -rw-r--r-- | packages/hal/hal_0.5.9.bb | 22 |
3 files changed, 33 insertions, 12 deletions
diff --git a/packages/hal/hal-info_20070618.bb b/packages/hal/hal-info_20070618.bb new file mode 100644 index 0000000000..690dbe614d --- /dev/null +++ b/packages/hal/hal-info_20070618.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Hardware Abstraction Layer device information" +HOMEPAGE = "http://freedesktop.org/Software/hal" +SECTION = "unknown" +LICENSE = "GPL AFL" + +SRC_URI = "http://people.freedesktop.org/~david/dist/hal-info-20070618.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-recall --disable-video" + +do_configure() { + gnu-configize + libtoolize --force + oe_runconf +} + + +PACKAGE_ARCH = "all" +FILES_${PN} += "${datadir}/hal/" diff --git a/packages/hal/hal-info_git.bb b/packages/hal/hal-info_git.bb index 597107fe2b..2812f19fe0 100644 --- a/packages/hal/hal-info_git.bb +++ b/packages/hal/hal-info_git.bb @@ -6,6 +6,7 @@ LICENSE = "GPL AFL" PV = "${SRCDATE}+git" PR = "r1" +DEFAULT_PREFERENCE = "-1" SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git" @@ -17,4 +18,4 @@ EXTRA_OECONF = "--disable-recall --disable-video" PACKAGE_ARCH = "all" -FILES_${PN} += "/usr/share/hal/" +FILES_${PN} += "${datadir}/hal/" 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 |