diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-05-23 23:15:30 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-25 15:50:57 +0100 |
commit | 470c0fee68418bed0fff0f507a64ed3ba131b746 (patch) | |
tree | 5a487f5fb2c738412f5139dd6f4c78002739732d | |
parent | 5566567a23216fb35dd9bf5212bd0722a869f786 (diff) | |
download | poky-470c0fee68418bed0fff0f507a64ed3ba131b746.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
(From OE-Core rev: d3f6e1e6106ab539e73c19037915b2e4a5f2efa9)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/image_types.bbclass | 7 | ||||
-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 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal-initramfs.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal.bb | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index ec0cafd87b..69f859e39b 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -21,22 +21,25 @@ runimagecmd () { | |||
21 | } | 21 | } |
22 | 22 | ||
23 | IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" | 23 | IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" |
24 | |||
24 | IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" | 25 | IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" |
26 | |||
25 | IMAGE_CMD_ext2 = "genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2" | 27 | IMAGE_CMD_ext2 = "genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2" |
26 | IMAGE_CMD_ext2.gz () { | 28 | IMAGE_CMD_ext2.gz () { |
27 | rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz | 29 | rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz |
28 | genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 | 30 | genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 |
29 | gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 | 31 | gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 |
30 | mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz | 32 | mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz |
31 | rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz | 33 | rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz |
32 | } | 34 | } |
35 | |||
33 | IMAGE_CMD_ext3 () { | 36 | IMAGE_CMD_ext3 () { |
34 | genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 | 37 | genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 |
35 | tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 | 38 | tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 |
36 | } | 39 | } |
37 | IMAGE_CMD_ext3.gz () { | 40 | IMAGE_CMD_ext3.gz () { |
38 | rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz | 41 | rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz |
39 | genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 | 42 | genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 |
40 | tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 | 43 | tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 |
41 | gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 | 44 | gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 |
42 | mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz | 45 | mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz |
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" | |||
645 | DEFAULT_TASK_PROVIDER ?= "task-base" | 645 | DEFAULT_TASK_PROVIDER ?= "task-base" |
646 | MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" | 646 | MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" |
647 | IMAGE_ROOTFS_SIZE ?= "65536" | 647 | IMAGE_ROOTFS_SIZE ?= "65536" |
648 | IMAGE_ROOTFS_SIZE_ext2 ?= "65536" | ||
649 | IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" | ||
650 | IMAGE_ROOTFS_SIZE_ext3 ?= "65536" | ||
651 | IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536" | ||
652 | 648 | ||
653 | # Forcefully set CACHE now so future changes to things like | 649 | # Forcefully set CACHE now so future changes to things like |
654 | # MACHINE don't change the path to the cache | 650 | # 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 @@ | |||
1 | QA_LOGFILE = "${TMPDIR}/qa.log" | 1 | QA_LOGFILE = "${TMPDIR}/qa.log" |
2 | 2 | ||
3 | IMAGE_ROOTFS_SIZE_ext2 ?= "131072" | ||
4 | |||
5 | OEINCLUDELOGS ?= "yes" | 3 | OEINCLUDELOGS ?= "yes" |
6 | KERNEL_CONSOLE ?= "ttyS0" | 4 | KERNEL_CONSOLE ?= "ttyS0" |
7 | 5 | ||
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" | |||
6 | IMAGE_FSTYPES ?= "tar.bz2 ext3" | 6 | IMAGE_FSTYPES ?= "tar.bz2 ext3" |
7 | 7 | ||
8 | ROOT_FLASH_SIZE = "280" | 8 | ROOT_FLASH_SIZE = "280" |
9 | IMAGE_ROOTFS_SIZE_ext2 ?= "280000" | ||
10 | IMAGE_ROOTFS_SIZE_ext3 ?= "280000" | ||
11 | 9 | ||
12 | # Don't include kernels in standard images | 10 | # Don't include kernels in standard images |
13 | RDEPENDS_kernel-base = "" | 11 | RDEPENDS_kernel-base = "" |
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb index 21aaa6c70e..3246d5ca6e 100644 --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb | |||
@@ -8,3 +8,5 @@ IMAGE_LINGUAS = "" | |||
8 | LICENSE = "MIT" | 8 | LICENSE = "MIT" |
9 | 9 | ||
10 | inherit core-image | 10 | inherit core-image |
11 | |||
12 | IMAGE_ROOTFS_SIZE = "8192" | ||
diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb index aa00e67c1a..743e121b59 100644 --- a/meta/recipes-core/images/core-image-minimal.bb +++ b/meta/recipes-core/images/core-image-minimal.bb | |||
@@ -9,5 +9,7 @@ LICENSE = "MIT" | |||
9 | 9 | ||
10 | inherit core-image | 10 | inherit core-image |
11 | 11 | ||
12 | IMAGE_ROOTFS_SIZE = "8192" | ||
13 | |||
12 | # remove not needed ipkg informations | 14 | # remove not needed ipkg informations |
13 | ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " | 15 | ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " |