[oe-commits] org.oe.oz354x machines/rootfs_ipk.bbclass: switched to IPKG_EXTRA_ARCHS like it is done in .dev

[hrw commit]

machines/rootfs_ipk.bbclass: switched to IPKG_EXTRA_ARCHS like it is done in .dev

Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: f4a6327f28daab9f7d7336159fd3def6c263f47a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f4a6327f28daab9f7d7336159fd3def6c263f47a
Files:
1
classes/rootfs_ipk.bbclass
conf/machine/collie.conf
conf/machine/include/zaurus-clamshell.conf
conf/machine/poodle.conf
conf/machine/tosa.conf
Diffs:

#
# mt diff -r1448a395b94164bbe414b04dbcce8b9cae8326ba -rf4a6327f28daab9f7d7336159fd3def6c263f47a
#
# 
# 
# patch "classes/rootfs_ipk.bbclass"
#  from [992ba5c4e7b5df9cc3f4b73515d970ea2eba8bdf]
#    to [1489e7e3f15fbaeb2be0474e5a2ef62d52c87470]
# 
# patch "conf/machine/collie.conf"
#  from [460af4993ef9b02f32cd7c2c5950346840c80553]
#    to [5c215297c6ec7aa0ad96513ab55ba111c7c9c61d]
# 
# patch "conf/machine/include/zaurus-clamshell.conf"
#  from [98eb7952ccb2630a606441979e952c018a062596]
#    to [2e7cac60688c8fbf35a781c0ee6bdd6ad6328e9e]
# 
# patch "conf/machine/poodle.conf"
#  from [6ae63dc302bf8f62895dd697b0e12057b09f957b]
#    to [a978b9ce7144a1d12ebd985897e45eec24a23cd8]
# 
# patch "conf/machine/tosa.conf"
#  from [b3676b1eed3f7a186baa86ea39cf5afbbbae90d7]
#    to [2a3c885ca88c65ce832b04c1c329410a0df46571]
# 
============================================================
--- classes/rootfs_ipk.bbclass	992ba5c4e7b5df9cc3f4b73515d970ea2eba8bdf
+++ classes/rootfs_ipk.bbclass	1489e7e3f15fbaeb2be0474e5a2ef62d52c87470
@@ -42,7 +42,7 @@ real_do_rootfs () {
 		echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
 	fi
 	
-	ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
+ 	ipkgarchs="${IPKG_ARCHS}"
 	priority=1
 	for arch in $ipkgarchs; do
 		echo "arch $arch $priority" >> ${T}/ipkg.conf
============================================================
--- conf/machine/collie.conf	460af4993ef9b02f32cd7c2c5950346840c80553
+++ conf/machine/collie.conf	5c215297c6ec7aa0ad96513ab55ba111c7c9c61d
@@ -1,9 +1,8 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ${MACHINE}"
 
 ZKERNEL_VERSION ?= "2.6"
 include conf/machine/include/collie-${ZKERNEL_VERSION}.conf
============================================================
--- conf/machine/include/zaurus-clamshell.conf	98eb7952ccb2630a606441979e952c018a062596
+++ conf/machine/include/zaurus-clamshell.conf	2e7cac60688c8fbf35a781c0ee6bdd6ad6328e9e
@@ -1,5 +1,5 @@ TARGET_ARCH = "arm"
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
============================================================
--- conf/machine/poodle.conf	6ae63dc302bf8f62895dd697b0e12057b09f957b
+++ conf/machine/poodle.conf	a978b9ce7144a1d12ebd985897e45eec24a23cd8
@@ -1,9 +1,9 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600
 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te poodle"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
 ZKERNEL_VERSION ?= "2.6"
 include conf/machine/include/poodle-${ZKERNEL_VERSION}.conf
============================================================
--- conf/machine/tosa.conf	b3676b1eed3f7a186baa86ea39cf5afbbbae90d7
+++ conf/machine/tosa.conf	2a3c885ca88c65ce832b04c1c329410a0df46571
@@ -1,9 +1,9 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-6000
 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te tosa"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
 ZKERNEL_VERSION ?= "2.6"
 include conf/machine/include/tosa-${ZKERNEL_VERSION}.conf