From 37285ab358c1ff2935e5ae686a80e5f19d998d6b Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Fri, 2 Sep 2011 11:54:30 +0800 Subject: hal: Remove build time dependency of virtual/kernel hal has runtime dependency on kernel, but not build time. Remove it from "DEPENDS" list. Also fix a wrong PACKAGE_ARCH setting when building multilib lib32-hal, because ":=" will be extended immediately which is not the right value. Using TUNE_PKGARCH instead. (From OE-Core rev: 74646a2b2d7d452dfe95b08940389a686e8addcb) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- meta/recipes-support/hal/hal.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'meta/recipes-support/hal') diff --git a/meta/recipes-support/hal/hal.inc b/meta/recipes-support/hal/hal.inc index d276d467b1..b00455b6ba 100644 --- a/meta/recipes-support/hal/hal.inc +++ b/meta/recipes-support/hal/hal.inc @@ -6,7 +6,7 @@ SECTION = "unknown" LICENSE = "GPLv2+ | AFL" LIC_FILES_CHKSUM = "file://COPYING;md5=5b5ffd59fbb7c2fff6de76c94177af31" -DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native" +DEPENDS = "dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native" RDEPENDS_${PN} += "udev hal-info" SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \ @@ -30,9 +30,8 @@ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ ${@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)}" +PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'acpi', '${MACHINE_ARCH}', '${TUNE_PKGARCH}',d)}" +PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '${TUNE_PKGARCH}',d)}" do_install_append() { install -d ${D}/etc/dbus-1/event.d -- cgit v1.2.3-54-g00ecf