[oe-commits] org.oe.dev zaurus machines: Clean up IPKG_EXTRA_ARCHS and IMAGE_FSTPES (from poky)

[rpurdie commit]

zaurus machines: Clean up IPKG_EXTRA_ARCHS and IMAGE_FSTPES (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 810a665c8a0d912363becb37a0848c5f066942eb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=810a665c8a0d912363becb37a0848c5f066942eb
Files:
1
conf/machine/akita.conf
conf/machine/c7x0.conf
conf/machine/include/zaurus-clamshell.conf
conf/machine/ipaq-pxa270.conf
conf/machine/nokia770.conf
conf/machine/spitz.conf
Diffs:

#
# mt diff -r6d0f4411a1166e26c839e03cdff62acdec3263a4 -r810a665c8a0d912363becb37a0848c5f066942eb
#
# 
# 
# patch "conf/machine/akita.conf"
#  from [8b11cd2ed6a7b2f1e64412578a77cb0563ba73ed]
#    to [74581829e65993d1260cb84be98bf2e463bb3351]
# 
# patch "conf/machine/c7x0.conf"
#  from [9142fe6d5c9a707a87d214641dbd438445856b75]
#    to [46c69776071ac2f32d8e2879732be91c9c496265]
# 
# patch "conf/machine/include/zaurus-clamshell.conf"
#  from [579c5519adf02d115de0b1b0ca7b52e0a7300ce8]
#    to [8a8a599f02be15515dfb973930a599edf8a4e5b0]
# 
# patch "conf/machine/ipaq-pxa270.conf"
#  from [45adeccdc48ee161bf2845c7ba8928d3d4c5e23a]
#    to [cf5aee9298212db2f1d2a09e4d3ac6338cf0625e]
# 
# patch "conf/machine/nokia770.conf"
#  from [29c0958e2fff720417c08c656c7e0303d40726cb]
#    to [a2ce848754b1605905388c019bc70df81bd5d2e5]
# 
# patch "conf/machine/spitz.conf"
#  from [5422a68bcba644b02821fb387160e8a4a8812a45]
#    to [c0bb39b828feec5dc86c26f3a16f626256538f2e]
# 
============================================================
--- conf/machine/akita.conf	8b11cd2ed6a7b2f1e64412578a77cb0563ba73ed
+++ conf/machine/akita.conf	74581829e65993d1260cb84be98bf2e463bb3351
@@ -1,9 +1,11 @@ include conf/machine/include/zaurus-clam
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-2.6.conf
-IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt"
 
+IPKG_EXTRA_ARCHS += "iwmmxt" 
+IMAGE_FSTYPES ?= "jffs2"
+
 ROOT_FLASH_SIZE = "58"
============================================================
--- conf/machine/c7x0.conf	9142fe6d5c9a707a87d214641dbd438445856b75
+++ conf/machine/c7x0.conf	46c69776071ac2f32d8e2879732be91c9c496265
@@ -5,5 +5,7 @@ include conf/machine/include/zaurus-clam
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-2.6.conf
 
+IMAGE_FSTYPES ?= "jffs2"
+
 ROOT_FLASH_SIZE = "25"
 # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
============================================================
--- conf/machine/include/zaurus-clamshell.conf	579c5519adf02d115de0b1b0ca7b52e0a7300ce8
+++ conf/machine/include/zaurus-clamshell.conf	8a8a599f02be15515dfb973930a599edf8a4e5b0
@@ -14,7 +14,7 @@ EXTRA_IMAGECMD_jffs2 += "&& sumtool -i $
 # add a summary to the jffs2 file to make it mount a lot faster
 EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
                          -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
-                          --eraseblock=0x4000 -l -p"
+                         --eraseblock=0x4000 -l -p"
 IMAGE_CMD_jffs2 +=	"; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
   		         ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img"
 
============================================================
--- conf/machine/ipaq-pxa270.conf	45adeccdc48ee161bf2845c7ba8928d3d4c5e23a
+++ conf/machine/ipaq-pxa270.conf	cf5aee9298212db2f1d2a09e4d3ac6338cf0625e
@@ -18,6 +18,8 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${D
 			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
 			  -e 256KiB -p"
 
+IMAGE_FSTYPES ?= "jffs2"
+
 MODUTILS = "26"	
 PCMCIA_MANAGER = "pcmciautils"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
============================================================
--- conf/machine/nokia770.conf	29c0958e2fff720417c08c656c7e0303d40726cb
+++ conf/machine/nokia770.conf	a2ce848754b1605905388c019bc70df81bd5d2e5
@@ -21,6 +21,8 @@ EXTRA_IMAGECMD_jffs2_nokia770 = "--pad -
 ROOT_FLASH_SIZE = "123"
 EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000"
 
+IMAGE_FSTYPES ?= "jffs2"
+
 # serial console port on devboard rev. B3
 SERIAL_CONSOLE = "115200 ttyS0"
 
============================================================
--- conf/machine/spitz.conf	5422a68bcba644b02821fb387160e8a4a8812a45
+++ conf/machine/spitz.conf	c0bb39b828feec5dc86c26f3a16f626256538f2e
@@ -5,15 +5,14 @@ include conf/machine/include/zaurus-clam
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-2.6.conf
 
-IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt"
-
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 PIVOTBOOT_EXTRA_RRECOMMENDS += ""
 
 # Useful things for the built-in Harddisk
 BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
 
-IMAGE_FSTYPES = "jffs2 tar.gz"
+IPKG_EXTRA_ARCHS += "iwmmxt"
+IMAGE_FSTYPES ?= "tar.gz"
 
 ROOT_FLASH_SIZE = "100"
 # actually that should really read ROOTFS_SIZE = "100", because with modern kernels,