summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2006-01-12 08:53:59 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-12 08:53:59 +0000
commitf9f38d4d7803a93cfa5f9b40007cd887c7bd8ac0 (patch)
tree38ab6a73577cbc67279625b5dbabd05bb6122e8b
parent5b58a4be73a2187398033ec4e141dd09f4a89ab2 (diff)
ixp4xx-kernel: correct PACKAGE_ARCH in 2.6.15
- this change ensures that the kernel packages (as opposed to the kernel-module- packages) follow the IXP4XX_SUFFIX value (which is by default MACHINE_ARCH), the modules default to MACHINE_ARCH as before (ixp4xxl or ixp4xxb as appropriate).
-rw-r--r--packages/linux/ixp4xx-kernel.inc10
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.15.bb2
2 files changed, 7 insertions, 5 deletions
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index dbf9c364bb..233d2a655c 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -41,10 +41,6 @@ DESCRIPTION = "Linux kernel for the Intel IXP4xx device"
LICENSE = "GPL"
MAINTAINER = "NSLU2-Linux <www.nslu2-linux.org>"
-# PACKAGE_ARCH must reliably identify what machines this kernel
-# will run on
-PACKAGE_ARCH = "${IXP4XX_SUFFIX}"
-
# Defaults for the prefix flags
IXP4XX_MACHID ?= ""
IXP4XX_LEFIXUP ?= ""
@@ -173,6 +169,12 @@ COMPATIBLE_HOST = 'arm.*-linux'
inherit kernel
+# PACKAGE_ARCH must reliably identify what machines this kernel
+# will run on
+PACKAGE_ARCH_kernel-image = "${IXP4XX_SUFFIX}"
+PACKAGE_ARCH_kernel-dev = "${IXP4XX_SUFFIX}"
+PACKAGE_ARCH_kernel = "${IXP4XX_SUFFIX}"
+
ARCH = "arm"
KERNEL_IMAGETYPE = "zImage"
diff --git a/packages/linux/ixp4xx-kernel_2.6.15.bb b/packages/linux/ixp4xx-kernel_2.6.15.bb
index 7722ef62c8..39ad707916 100644
--- a/packages/linux/ixp4xx-kernel_2.6.15.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.15.bb
@@ -8,7 +8,7 @@ PR_CONFIG = "0"
# Increment the number below (i.e. the digits after PR) when
# making changes within this file or for changes to the patches
# applied to the kernel.
-PR = "r2.${PR_CONFIG}"
+PR = "r3.${PR_CONFIG}"
include ixp4xx-kernel.inc