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

diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index dbf9c36..233d2a6 100644 (file)
--- 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 7722ef6..39ad707 100644 (file)
--- 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