From bae63d32a229ae899997521980b28ac3cf0c2b71 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 21 Jul 2006 12:10:38 +0000 Subject: conf/machines: Set IMAGE_FSTYPE correctly for each machine git-svn-id: https://svn.o-hand.com/repos/poky/trunk@533 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/machine/akita.conf | 2 ++ meta/conf/machine/c7x0.conf | 2 ++ meta/conf/machine/cmx270.conf | 2 ++ meta/conf/machine/ipaq-pxa270.conf | 2 ++ meta/conf/machine/nokia770.conf | 2 ++ meta/conf/machine/qemuarm.conf | 2 +- meta/conf/machine/spitz.conf | 2 +- 7 files changed, 12 insertions(+), 2 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/machine/akita.conf b/meta/conf/machine/akita.conf index 89c0d031e..c191b9031 100644 --- a/meta/conf/machine/akita.conf +++ b/meta/conf/machine/akita.conf @@ -5,4 +5,6 @@ include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-clamshell-2.6.conf +IMAGE_FSTYPES ?= "jffs2" + ROOT_FLASH_SIZE = "58" diff --git a/meta/conf/machine/c7x0.conf b/meta/conf/machine/c7x0.conf index 0bd962352..4b1d8edb8 100644 --- a/meta/conf/machine/c7x0.conf +++ b/meta/conf/machine/c7x0.conf @@ -5,5 +5,7 @@ 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. diff --git a/meta/conf/machine/cmx270.conf b/meta/conf/machine/cmx270.conf index fc281f374..d35ca0430 100644 --- a/meta/conf/machine/cmx270.conf +++ b/meta/conf/machine/cmx270.conf @@ -10,6 +10,8 @@ IMAGE_CMD_jffs2 = "mkdir -p ${DEPLOY_DIR_IMAGE}; \ mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img ${EXTRA_IMAGECMD}; " +IMAGE_FSTYPES ?= "jffs2 tar.bz2" + PREFERRED_PROVIDER_virtual/bootloader = "" # 800x480 is big enough for me diff --git a/meta/conf/machine/ipaq-pxa270.conf b/meta/conf/machine/ipaq-pxa270.conf index f5cc893c9..ffa8b2d9c 100644 --- a/meta/conf/machine/ipaq-pxa270.conf +++ b/meta/conf/machine/ipaq-pxa270.conf @@ -18,6 +18,8 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ -e 256KiB -p" +IMAGE_FSTYPES ?= "tar.bz2" + MODUTILS = "26" PCMCIA_MANAGER = "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " diff --git a/meta/conf/machine/nokia770.conf b/meta/conf/machine/nokia770.conf index bf893660d..9bde19dcf 100644 --- a/meta/conf/machine/nokia770.conf +++ b/meta/conf/machine/nokia770.conf @@ -22,6 +22,8 @@ include conf/machine/include/tune-arm926ejs.conf 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" diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 3341efd1a..40de141fd 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -39,7 +39,7 @@ ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsam #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm \ # kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" -IMAGE_FSTYPES = "tar.bz2" +IMAGE_FSTYPES ?= "tar.bz2" ROOT_FLASH_SIZE = "100" # actually that should really read ROOTFS_SIZE = "100", because with modern kernels, diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf index f78dd7a3b..f8b0572b4 100644 --- a/meta/conf/machine/spitz.conf +++ b/meta/conf/machine/spitz.conf @@ -11,7 +11,7 @@ PIVOTBOOT_EXTRA_RRECOMMENDS += "" # Useful things for the built-in Harddisk BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" -IMAGE_FSTYPES = "jffs2 tar.gz" +IMAGE_FSTYPES ?= "tar.gz" ROOT_FLASH_SIZE = "100" # actually that should really read ROOTFS_SIZE = "100", because with modern kernels, -- cgit v1.2.3