diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2011-05-23 23:15:30 -0700 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-05-25 01:36:31 -0700 |
| commit | d3f6e1e6106ab539e73c19037915b2e4a5f2efa9 (patch) | |
| tree | c13bcae13c80a0f889d1f90523d8a50fb84dc1e4 /meta/conf | |
| parent | 05f017dc6878908cf55901f8a74c738f3bece077 (diff) | |
| download | openembedded-core-contrib-d3f6e1e6106ab539e73c19037915b2e4a5f2efa9.tar.gz | |
IMAGE_ROOTFS_SIZE Cleanup
This basic cleanup removes the _ext2/3 overrides from places they
no longer belong since they did not allow further overrides. In doing
this the core-image-minimal* recipes can now set a reasonably small
rootfs so that it's a realistic size for minimal.
The new default for minimal is 8M and will be adujsted upward by the
IMAGE_OVERHEAD_FACTOR (default of 1.3).
This also fixes the ROOTFS_SIZE usage in the IMAGE_CMD_<fstype> code
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 4 | ||||
| -rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/qemu.inc | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index a0af672ae2..18028f3001 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -645,10 +645,6 @@ PCMCIA_MANAGER ?= "pcmcia-cs" DEFAULT_TASK_PROVIDER ?= "task-base" MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" IMAGE_ROOTFS_SIZE ?= "65536" -IMAGE_ROOTFS_SIZE_ext2 ?= "65536" -IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" -IMAGE_ROOTFS_SIZE_ext3 ?= "65536" -IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536" # Forcefully set CACHE now so future changes to things like # MACHINE don't change the path to the cache diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 1aa45c8898..4b68a0a54c 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -1,7 +1,5 @@ QA_LOGFILE = "${TMPDIR}/qa.log" -IMAGE_ROOTFS_SIZE_ext2 ?= "131072" - OEINCLUDELOGS ?= "yes" KERNEL_CONSOLE ?= "ttyS0" diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 4122a882dd..9ef242f386 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -6,8 +6,6 @@ MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" IMAGE_FSTYPES ?= "tar.bz2 ext3" ROOT_FLASH_SIZE = "280" -IMAGE_ROOTFS_SIZE_ext2 ?= "280000" -IMAGE_ROOTFS_SIZE_ext3 ?= "280000" # Don't include kernels in standard images RDEPENDS_kernel-base = "" |