[PATCH] bitbake.conf: use ROOTFS_SIZE for gzip'd images

[PATCH] bitbake.conf: use ROOTFS_SIZE for gzip'd images

[Roman I Khimov]

Make ext2.gz and ext3.gz images use ROOTFS_SIZE parameter for genext2s (as
non-compressed ext2 and ext3 does).

This allows to use IMAGE_EXTRA_SPACE configuration.
---
 conf/bitbake.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 7c159af..9d372f1 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -326,9 +326,9 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime --output=
 IMAGE_CMD_yaffs2 = "mkyaffs2image ${EXTRA_IMAGECMD} ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.yaffs2"
 IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
 IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}"
-IMAGE_CMD_ext2.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
+IMAGE_CMD_ext2.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
 IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
+IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
 IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
 IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend"
 IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
-- 
1.6.2.1


-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Re: [PATCH] bitbake.conf: use ROOTFS_SIZE for gzip'd images

[Roman I Khimov]

On Monday 30 March 2009 13:18:43 Roman I Khimov wrote:
>  conf/bitbake.conf |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

ping

Re: [PATCH] bitbake.conf: use ROOTFS_SIZE for gzip'd images

[Roman I Khimov]

On Monday 30 March 2009 13:18:43 Roman I Khimov wrote:
>  conf/bitbake.conf |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

ping

Re: [PATCH] bitbake.conf: use ROOTFS_SIZE for gzip'd images

[Koen Kooi]

On 30-03-09 11:18, Roman I Khimov wrote:
> Make ext2.gz and ext3.gz images use ROOTFS_SIZE parameter for genext2s (as
> non-compressed ext2 and ext3 does).

Is marcins patch to use du -k applicable as well? If not:

Acked-by: Koen Kooi <koen@openembedded.org>



> This allows to use IMAGE_EXTRA_SPACE configuration.
> ---
>   conf/bitbake.conf |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/conf/bitbake.conf b/conf/bitbake.conf
> index 7c159af..9d372f1 100644
> --- a/conf/bitbake.conf
> +++ b/conf/bitbake.conf
> @@ -326,9 +326,9 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime --output=
>   IMAGE_CMD_yaffs2 = "mkyaffs2image ${EXTRA_IMAGECMD} ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.yaffs2"
>   IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
>   IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}"
> -IMAGE_CMD_ext2.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz&&  mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
> +IMAGE_CMD_ext2.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz&&  mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
>   IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
> -IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz&&  mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
> +IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz&&  mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
>   IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
>   IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend"
>   IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS}&&  tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."

Re: [PATCH] bitbake.conf: use ROOTFS_SIZE for gzip'd images

[Tom Rini]

On Mon, Mar 30, 2009 at 01:18:43PM +0400, Roman I Khimov wrote:

> Make ext2.gz and ext3.gz images use ROOTFS_SIZE parameter for genext2s (as
> non-compressed ext2 and ext3 does).
> 
> This allows to use IMAGE_EXTRA_SPACE configuration.

Acked-by: Tom Rini <trini@embeddedalley.com>

-- 
Tom Rini

Re: [PATCH] bitbake.conf: use ROOTFS_SIZE for gzip'd images

[Leon Woestenberg]

Hello,

On Mon, Mar 30, 2009 at 11:18 AM, Roman I Khimov <khimov@altell.ru> wrote:
> Make ext2.gz and ext3.gz images use ROOTFS_SIZE parameter for genext2s (as
> non-compressed ext2 and ext3 does).
>
> This allows to use IMAGE_EXTRA_SPACE configuration.
>
Could you explain how this works?


Regards,

Leon

Re: [PATCH] bitbake.conf: use ROOTFS_SIZE for gzip'd images

[Roman I Khimov]

On Wednesday 22 April 2009 00:51:15 Leon Woestenberg wrote:
> Hello,
>
> On Mon, Mar 30, 2009 at 11:18 AM, Roman I Khimov <khimov@altell.ru> wrote:
> > Make ext2.gz and ext3.gz images use ROOTFS_SIZE parameter for genext2s
> > (as non-compressed ext2 and ext3 does).
> >
> > This allows to use IMAGE_EXTRA_SPACE configuration.
>
> Could you explain how this works?

IMAGE_EXTRA_SPACE was brought into OE with commit 
d38f1dd24dd6ed94408aa49aad33e46634a129ff, see comment for that. This one just 
fixes it for compressed images.

Re: [PATCH] bitbake.conf: use ROOTFS_SIZE for gzip'd images

[Leon Woestenberg]

On Wed, Apr 22, 2009 at 6:59 AM, Roman I Khimov <khimov@altell.ru> wrote:
> On Wednesday 22 April 2009 00:51:15 Leon Woestenberg wrote:
>> Hello,
>>
>> On Mon, Mar 30, 2009 at 11:18 AM, Roman I Khimov <khimov@altell.ru> wrote:
>> > Make ext2.gz and ext3.gz images use ROOTFS_SIZE parameter for genext2s
>> > (as non-compressed ext2 and ext3 does).
>> >
>> > This allows to use IMAGE_EXTRA_SPACE configuration.
>>
>> Could you explain how this works?
>
> IMAGE_EXTRA_SPACE was brought into OE with commit
> d38f1dd24dd6ed94408aa49aad33e46634a129ff, see comment for that. This one just
> fixes it for compressed images.
>

Hmm, this part runs on the host:

ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}


Would this correctly work if my host has a, say 16kB block, XFS
filesystem? I.e. would "du -ks" correctly estimate the amount of
ext2/3 blocks needed to layout the rootfs on ext2/3?

Regards,
-- 
Leon

Re: [PATCH] bitbake.conf: use ROOTFS_SIZE for gzip'd images

[Roman I Khimov]

On Thursday 23 April 2009 14:26:55 Leon Woestenberg wrote:
> On Wed, Apr 22, 2009 at 6:59 AM, Roman I Khimov <khimov@altell.ru> wrote:
> > IMAGE_EXTRA_SPACE was brought into OE with commit
> > d38f1dd24dd6ed94408aa49aad33e46634a129ff, see comment for that. This one
> > just fixes it for compressed images.
>
> Hmm, this part runs on the host:
>
> ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}
>
> Would this correctly work if my host has a, say 16kB block, XFS
> filesystem? I.e. would "du -ks" correctly estimate the amount of
> ext2/3 blocks needed to layout the rootfs on ext2/3?

Well, my 'du' manual says

	-k     like --block-size=1K

So it's just kilobytes or at least should be so. And in genext2fs there is

	#define BLOCKSIZE         1024

For its "-b".

Re: [PATCH] bitbake.conf: use ROOTFS_SIZE for gzip'd images

[Leon Woestenberg]

Hello Roman,

On Thu, Apr 23, 2009 at 12:47 PM, Roman I Khimov <khimov@altell.ru> wrote:
> On Thursday 23 April 2009 14:26:55 Leon Woestenberg wrote:
>> On Wed, Apr 22, 2009 at 6:59 AM, Roman I Khimov <khimov@altell.ru> wrote:
>
> Well, my 'du' manual says
>
>        -k     like --block-size=1K
>
> So it's just kilobytes or at least should be so. And in genext2fs there is
>
>        #define BLOCKSIZE         1024
>
Yup, thanks.

I assumed "du" estimates for a particular (the current?) filesystem,
but I could not find anything on this.

Regards,
-- 
Leon