summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-04-01 13:25:44 +0000
committerMichael Lauer <mickey@vanille-media.de>2005-04-01 13:25:44 +0000
commit8b04076f35f8c65266413871221f04cd34d68a7a (patch)
treefc53434b96ea8ee86e2685df7b16d9a0376d8da3
parent47b4803808f87d0e71f58846dc17685b557a0fe5 (diff)
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
-rw-r--r--packages/linux/c7x0-kernels-2.4-embedix.bb4
-rw-r--r--packages/linux/collie-kernels-2.4-embedix.bb5
-rw-r--r--packages/linux/linux-x86_2.6.11.6.bb14
3 files changed, 22 insertions, 1 deletions
diff --git a/packages/linux/c7x0-kernels-2.4-embedix.bb b/packages/linux/c7x0-kernels-2.4-embedix.bb
index c7081e7cb3..3a2c3b1205 100644
--- 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 88b3979548..037d6ffc21 100644
--- 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 e69de29bb2..85512d0b3e 100644
--- 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"