Patchwork [1/5] hal: Remove build time dependency of virtual/kernel

login
register
mail settings
Submitter Dongxiao Xu
Date Sept. 2, 2011, 9:03 a.m.
Message ID <4959b5dd8cbbed8bbbd6aace139e93b9ced52f80.1314953755.git.dongxiao.xu@intel.com>
Download mbox | patch
Permalink /patch/10897/
State New, archived
Headers show

Comments

Dongxiao Xu - Sept. 2, 2011, 9:03 a.m.
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.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/recipes-support/hal/hal.inc |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
Koen Kooi - Sept. 7, 2011, 8:36 a.m.
Op 2 sep. 2011, om 11:03 heeft Dongxiao Xu het volgende geschreven:

> 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.

After this patch it fails to build with:

| probe-video4linux.c:33:28: fatal error: linux/videodev.h: No such file or directory

Which does look like a kernel header to me
Dongxiao Xu - Sept. 7, 2011, 8:44 a.m.
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Koen Kooi
> Sent: Wednesday, September 07, 2011 4:36 PM
> To: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [PATCH 1/5] hal: Remove build time dependency of
> virtual/kernel
> 
> 
> Op 2 sep. 2011, om 11:03 heeft Dongxiao Xu het volgende geschreven:
> 
> > 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.
> 
> After this patch it fails to build with:
> 
> | probe-video4linux.c:33:28: fatal error: linux/videodev.h: No such file
> | or directory
> 
> Which does look like a kernel header to me

Thanks Koen, it seems that we still need to draw back "virtual/kernel" as hal's DEPENDS.

Thanks,
Dongxiao

> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-support/hal/hal.inc b/meta/recipes-support/hal/hal.inc
index d276d46..b00455b 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