From 65930a38e415ae4a0182e1cea1be838e0ada50ee Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 16 Nov 2006 14:45:43 +0000
Subject: Modify IMAGE_ROOTFS_SIZE_ext2 for cmx270

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@862 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/conf/bitbake.conf        | 5 +++--
 meta/conf/distro/poky.conf    | 2 +-
 meta/conf/machine/cmx270.conf | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'meta/conf')

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 49c4544f7..08ce44d8e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -199,8 +199,6 @@ IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE
 EXTRA_IMAGECMD = ""
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 EXTRA_IMAGECMD_squashfs = "-le -b 16384"
-IMAGE_ROOTFS_SIZE_ext2 = "65536"
-IMAGE_ROOTFS_SIZE_ext2.gz = "65536"
 
 IMAGE_DEPENDS = ""
 IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
@@ -423,6 +421,9 @@ require conf/sanity.conf
 IMAGE_FSTYPES ?= "jffs2"
 PCMCIA_MANAGER ?= "pcmcia-cs"
 MACHINE_TASK_PROVIDER ?= "task-bootstrap"
+IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
+IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
+
 
 
 ##################################################################
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 03c53004e..bbf8d940a 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -16,7 +16,7 @@ INHERIT += " ${PACKAGE_CLASSES} debian multimachine poky devshell "
 TARGET_OS = "linux"
 TARGET_FPU_arm ?= "soft"
 TARGET_FPU_armeb ?= "soft"
-IMAGE_ROOTFS_SIZE_ext2 = 131072
+IMAGE_ROOTFS_SIZE_ext2 ?= 131072
 
 PARALLEL_INSTALL_MODULES = "1"
 
diff --git a/meta/conf/machine/cmx270.conf b/meta/conf/machine/cmx270.conf
index 509da675a..37ea0f707 100644
--- a/meta/conf/machine/cmx270.conf
+++ b/meta/conf/machine/cmx270.conf
@@ -12,6 +12,8 @@ IMAGE_CMD_jffs2 = "mkdir -p ${DEPLOY_DIR_IMAGE}; \
 
 IMAGE_FSTYPES ?= "jffs2 tar.bz2 ext2"
 
+IMAGE_ROOTFS_SIZE_ext2 = 120000
+
 PREFERRED_PROVIDER_virtual/bootloader = ""
 
 # 800x480 is big enough for me
-- 
cgit v1.2.3