Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/04/01 15:25:27+02:00 uni-frankfurt.de!mickeyl
specify compatible host for c7x0 and collie kernels. choose proper image type for linux-x86

BKrev: 424d4bd8NZAL0w4kj35x01hAdCQQ3g

diff --git a/packages/linux/c7x0-kernels-2.4-embedix.bb b/packages/linux/c7x0-kernels-2.4-embedix.bb
index c7081e7..3a2c3b1 100644 (file)
--- a/packages/linux/c7x0-kernels-2.4-embedix.bb
+++ b/packages/linux/c7x0-kernels-2.4-embedix.bb
@@ -2,6 +2,10 @@ DESCRIPTION = "Build all c7x0 kernels in one go"
 SECTION = "kernel"
 LICENSE = "GPL"
 PROVIDES = "virtual/kernel"
+PR = "r1"
+
+COMPATIBLE_HOST = "arm.*-linux"
+
 DEPENDS = "corgi-kernel-2.4-embedix shepherd-kernel-2.4-embedix husky-kernel-2.4-embedix"
 
 PACKAGES = ""

diff --git a/packages/linux/collie-kernels-2.4-embedix.bb b/packages/linux/collie-kernels-2.4-embedix.bb
index 88b3979..037d6ff 100644 (file)
--- a/packages/linux/collie-kernels-2.4-embedix.bb
+++ b/packages/linux/collie-kernels-2.4-embedix.bb
@@ -3,8 +3,11 @@ SECTION = "kernel"
 MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 LICENSE = "GPL"
 PROVIDES = "virtual/kernel"
-PR = "r1"
+PR = "r2"
+
+COMPATIBLE_HOST = "arm.*-linux"
 
 DEPENDS = '${@base_conditional("DISTRO_TYPE", "debug", "openzaurus-sa", "collie-kernel-24-8 collie-kernel-32-0 collie-kernel-32-32 collie-kernel-40-24 collie-kernel-48-16 collie-kernel-58-6 collie-kernel-64-0",d)}'
 PACKAGES = ""
 EXCLUDE_FROM_WORLD = "1"
+

diff --git a/packages/linux/linux-x86_2.6.11.6.bb b/packages/linux/linux-x86_2.6.11.6.bb
index e69de29..85512d0 100644 (file)
--- a/packages/linux/linux-x86_2.6.11.6.bb
+++ b/packages/linux/linux-x86_2.6.11.6.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Linux Kernel for x86 compatible machines"
+SECTION = "kernel"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+           file://defconfig"
+
+S = "${WORKDIR}/linux-${PV}"
+
+inherit kernel
+
+COMPATIBLE_HOST = "i.86.*-linux"
+KERNEL_IMAGETYPE = "bzImage"