[oe-commits] org.oe.dev nslu2{b, l}e.conf: Fixed location of OVERRIDES so that it doesn't clobber the work of tune-thumb.

rwhitby commit openembedded-commits at lists.openembedded.org
Mon Feb 19 07:22:16 UTC 2007


nslu2{b,l}e.conf: Fixed location of OVERRIDES so that it doesn't clobber the work of tune-thumb.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 16171ae55790573667b9c030c80a790d123e19bf
ViewMTN: http://monotone.openembedded.org/revision.psp?id=16171ae55790573667b9c030c80a790d123e19bf
Files:
1
conf/machine/nslu2be.conf
conf/machine/nslu2le.conf
Diffs:

#
# mt diff -r89cd2556ac06a9a9dd5fe232a734dec9569772da -r16171ae55790573667b9c030c80a790d123e19bf
#
# 
# 
# patch "conf/machine/nslu2be.conf"
#  from [15ddd677b7bea545d74b4951aa95c605e4f87c77]
#    to [63b56555f0d009e7f35e02c718999049676c8b4a]
# 
# patch "conf/machine/nslu2le.conf"
#  from [7834504433a545c36deee3544a2ee1029cab3cee]
#    to [0ec778b3b995ad421489927fe5d55ea6a3f76d12]
# 
============================================================
--- conf/machine/nslu2be.conf	15ddd677b7bea545d74b4951aa95c605e4f87c77
+++ conf/machine/nslu2be.conf	63b56555f0d009e7f35e02c718999049676c8b4a
@@ -7,10 +7,9 @@ MACHINE_ARCH = "ixp4xxbe"
 PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
 
 MACHINE_ARCH = "ixp4xxbe"
-IXP4XX_MACHINE_OVERRIDE = ":nslu2:ixp4xx"
 
+OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
 require conf/machine/include/ixp4xx.conf
 
 EXTRA_IMAGECMD_jffs2 += "--big-endian"
-
-OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
============================================================
--- conf/machine/nslu2le.conf	7834504433a545c36deee3544a2ee1029cab3cee
+++ conf/machine/nslu2le.conf	0ec778b3b995ad421489927fe5d55ea6a3f76d12
@@ -8,9 +8,8 @@ MACHINE_ARCH = "ixp4xxle"
 
 MACHINE_ARCH = "ixp4xxle"
 
+OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
 require conf/machine/include/ixp4xx.conf
 
 EXTRA_IMAGECMD_jffs2 += "--little-endian"
-
-OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
-






More information about the Openembedded-commits mailing list