From: Mike Westerhof <mwester@dls.net>
Date: Wed, 22 Oct 2008 23:35:25 +0000 (-0500)
Subject: SlugOS: nslu2?e.conf - fix duplicate archs breakage
X-Git-Tag: Release-2010-05/1~5714
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d40f6e14fbd370672b111b4216f9736bae969d5b;p=openembedded.git

SlugOS: nslu2?e.conf - fix duplicate archs breakage
(caused by Koen's change PACKAGE_EXTRA_ARCHS change)
---

diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf
index 360e397e04..5bddf09148 100644
--- a/conf/machine/nslu2be.conf
+++ b/conf/machine/nslu2be.conf
@@ -4,7 +4,8 @@
 
 TARGET_ARCH = "armeb"
 
-PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
+# Note: armv4b armv4tb armv5teb will be added by tune-xscale.inc automatically.
+PACKAGE_EXTRA_ARCHS = "armv5eb ixp4xxbe"
 
 OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf
index 1ad9bdd96a..4ff36059a6 100644
--- a/conf/machine/nslu2le.conf
+++ b/conf/machine/nslu2le.conf
@@ -4,7 +4,8 @@
 
 TARGET_ARCH = "arm"
 
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle"
+# Note: armv4 armv4t armv5te will be added by tune-xscale.inc automatically.
+PACKAGE_EXTRA_ARCHS = "armv5e ixp4xxle"
 
 OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"