From: Chris Larson <clarson@kergoth.com>
Date: Wed, 1 Dec 2004 05:21:27 +0000 (+0000)
Subject: Make kernel.oeclass and module-base.oeclass set PACKAGE_ARCH to MACHINE_ARCH for... 
X-Git-Tag: Release-2010-05/1~15866
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6755cddd68fb7aeabaaa7324a4fcc839adbea3e5;p=openembedded.git

Make kernel.oeclass and module-base.oeclass set PACKAGE_ARCH to MACHINE_ARCH for now, since kernels and kernel modules are generally machine specific.

BKrev: 41ad54d7mqdoE_0hWzdUsHg0QM4PzQ
---

diff --git a/classes/kernel.oeclass b/classes/kernel.oeclass
index 0190e5fce6..a97f05880c 100644
--- a/classes/kernel.oeclass
+++ b/classes/kernel.oeclass
@@ -43,6 +43,13 @@ def get_kernelversion(p):
 
 KERNEL_VERSION = "${@get_kernelversion('${S}/include/linux/version.h')}"
 
+# kernels are generally machine specific
+python () {
+	mach = oe.data.getVar('MACHINE', d, 1)
+	if mach:
+		oe.data.setVar('PACKAGE_ARCH', oe.data.getVar('MACHINE_ARCH', d, 1), d)
+}
+
 kernel_do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
 	oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
diff --git a/classes/module-base.oeclass b/classes/module-base.oeclass
index 77e8ae4f78..0036ddf20c 100644
--- a/classes/module-base.oeclass
+++ b/classes/module-base.oeclass
@@ -11,3 +11,10 @@ KERNEL_CCSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-cc
 KERNEL_LDSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ldsuffix')}
 KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX}"
 KERNEL_LD = "${LD}${KERNEL_LDSUFFIX}"
+
+# kernel modules are generally machine specific
+python () {
+	mach = oe.data.getVar('MACHINE', d, 1)
+	if mach:
+		oe.data.setVar('PACKAGE_ARCH', oe.data.getVar('MACHINE_ARCH', d, 1), d)
+}