From b4cb437c6595ff8ac13506e502fe04b1a60c4e04 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 9 May 2006 18:38:19 +0000
Subject: Merge packages changes from OE into poky.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/packages/linux/linux-openzaurus.inc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'openembedded/packages/linux/linux-openzaurus.inc')

diff --git a/openembedded/packages/linux/linux-openzaurus.inc b/openembedded/packages/linux/linux-openzaurus.inc
index bd77b036a..c806452e5 100644
--- a/openembedded/packages/linux/linux-openzaurus.inc
+++ b/openembedded/packages/linux/linux-openzaurus.inc
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 
 inherit kernel
 
-RPROVIDES_kernel-image = "hostap-modules"
+RPROVIDES_kernel-image += "hostap-modules"
 
 DOSRC = "http://www.do13.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
@@ -21,6 +21,7 @@ ALLOW_EMPTY = 1
 
 EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|ipaq-pxa270|qemuarm)'
 
 CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
 CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2"
@@ -58,6 +59,13 @@ module_autoload_snd-soc-spitz_spitz = "snd-soc-spitz"
 do_configure() {
 	rm -f ${S}/.config
 
+	if [ "${MACHINE}" == "tosa" ]; then
+		gcc_version=`${KERNEL_CC} -dumpversion`		
+		if [ "${gcc_version}" == "4.0.1" ] || [ "${gcc_version}" == "4.0.2" ]; then
+			die "tosa kernel wont work with gcc 4.0.x"
+		fi
+	fi
+
 	if [ ! -e ${WORKDIR}/defconfig-${MACHINE} ]; then
 		die "No default configuration for ${MACHINE} available."
 	fi
-- 
cgit v1.2.3