[oe-commits] org.oe.dev Remove the MACHINE_ARCH override for nslu2be and nslu2le, to enable proper multimachine support for nslu2 and ixp4xx together in the same build tree.

[rwhitby commit]

Remove the MACHINE_ARCH override for nslu2be and nslu2le, to enable proper multimachine support for nslu2 and ixp4xx together in the same build tree.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: c2b6ec6ab4d7fe9e98eeb4ab4762cdb5da714774
ViewMTN: http://monotone.openembedded.org/revision/info/c2b6ec6ab4d7fe9e98eeb4ab4762cdb5da714774
Files:
1
conf/machine/nslu2be.conf
conf/machine/nslu2le.conf
Diffs:

#
# mt diff -r6a2f8b88ebaec691fe8bb38d4017e7aab95ddf63 -rc2b6ec6ab4d7fe9e98eeb4ab4762cdb5da714774
#
# 
# 
# patch "conf/machine/nslu2be.conf"
#  from [2eb05c6598de70bd095e0f2e54553a7de1c28fd0]
#    to [ee093d573002da68cdbf3408f25b09f0eca8d47d]
# 
# patch "conf/machine/nslu2le.conf"
#  from [c3ea05ab779688cea0d2db8845c8a89647ff5d17]
#    to [9c11d795f3c0528643a18edd362f677b5815b7c4]
# 
============================================================
--- conf/machine/nslu2be.conf	2eb05c6598de70bd095e0f2e54553a7de1c28fd0
+++ conf/machine/nslu2be.conf	ee093d573002da68cdbf3408f25b09f0eca8d47d
@@ -6,8 +6,6 @@ PACKAGE_EXTRA_ARCHS = "armv4b armv4tb ar
 
 PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
 
-MACHINE_ARCH = "ixp4xxbe"
-
 OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
 ROOT_FLASH_SIZE ?= "6"
============================================================
--- conf/machine/nslu2le.conf	c3ea05ab779688cea0d2db8845c8a89647ff5d17
+++ conf/machine/nslu2le.conf	9c11d795f3c0528643a18edd362f677b5815b7c4
@@ -6,8 +6,6 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle"
 
-MACHINE_ARCH = "ixp4xxle"
-
 OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
 ROOT_FLASH_SIZE ?= "6"