summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-09-02 11:54:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-02 18:15:31 +0100
commit37285ab358c1ff2935e5ae686a80e5f19d998d6b (patch)
treeeb1c2aa4020de8db26d0b03042d4cde5c503703b /meta/recipes-support
parent9ba02cca0e95a823613a6b5c04d8d2437b4e1a5f (diff)
downloadpoky-37285ab358c1ff2935e5ae686a80e5f19d998d6b.tar.gz
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 <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/hal/hal.inc7
1 files changed, 3 insertions, 4 deletions
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"
6LICENSE = "GPLv2+ | AFL" 6LICENSE = "GPLv2+ | AFL"
7LIC_FILES_CHKSUM = "file://COPYING;md5=5b5ffd59fbb7c2fff6de76c94177af31" 7LIC_FILES_CHKSUM = "file://COPYING;md5=5b5ffd59fbb7c2fff6de76c94177af31"
8 8
9DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native" 9DEPENDS = "dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native"
10RDEPENDS_${PN} += "udev hal-info" 10RDEPENDS_${PN} += "udev hal-info"
11 11
12SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \ 12SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \
@@ -30,9 +30,8 @@ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
30 ${@base_contains('MACHINE_FEATURES', 'acpi', '--enable-acpi', '--disable-acpi',d)} \ 30 ${@base_contains('MACHINE_FEATURES', 'acpi', '--enable-acpi', '--disable-acpi',d)} \
31 " 31 "
32 32
33MY_ARCH := "${PACKAGE_ARCH}" 33PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'acpi', '${MACHINE_ARCH}', '${TUNE_PKGARCH}',d)}"
34PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'acpi', '${MACHINE_ARCH}', '${MY_ARCH}',d)}" 34PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '${TUNE_PKGARCH}',d)}"
35PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}',d)}"
36 35
37do_install_append() { 36do_install_append() {
38 install -d ${D}/etc/dbus-1/event.d 37 install -d ${D}/etc/dbus-1/event.d