| Submitter | Andrei Gherzan |
|---|---|
| Date | Sept. 10, 2012, 6:18 p.m. |
| Message ID | <5d91c62217814247b57453bf6b6d97bc049caa1b.1347300913.git.andrei@gherzan.ro> |
| Download | mbox | patch |
| Permalink | /patch/36235/ |
| State | New |
| Headers | show |
Comments
On 09/10/2012 11:18 AM, Andrei Gherzan wrote: > If we round up ROOTFS_SIZE to IMAGE_ROOTFS_ALIGNMENT before checking if > base_size is greater then IMAGE_ROOTFS_SIZE, we can end up adding an > unaligned value to IMAGE_ROOTFS_SIZE. Obviously, if > IMAGE_ROOTFS_EXTRA_SPACE was overwritten with an unaligned value. So > let's add the round up code after the base_size calculus and it's > comparison. > > Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> > --- > meta/classes/image_types.bbclass | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass > index d286eea..0bd7a6f 100644 > --- a/meta/classes/image_types.bbclass > +++ b/meta/classes/image_types.bbclass > @@ -82,9 +82,13 @@ runimagecmd () { > # The base_size gets calculated: > # - initial size determined by `du -ks` of the IMAGE_ROOTFS > # - then multiplied by the IMAGE_OVERHEAD_FACTOR > - # - then rounded up to IMAGE_ROOTFS_ALIGNMENT > # - finally tested against IMAGE_ROOTFS_SIZE > - ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{base_size = $1 * ${IMAGE_OVERHEAD_FACTOR} + ${IMAGE_ROOTFS_ALIGNMENT} - 1; base_size -= base_size % ${IMAGE_ROOTFS_ALIGNMENT}; print ((base_size > ${IMAGE_ROOTFS_SIZE} ? base_size : ${IMAGE_ROOTFS_SIZE}) + ${IMAGE_ROOTFS_EXTRA_SPACE}) }'` > + ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{base_size = $1 * ${IMAGE_OVERHEAD_FACTOR}; print ((base_size > ${IMAGE_ROOTFS_SIZE} ? base_size : ${IMAGE_ROOTFS_SIZE}) + ${IMAGE_ROOTFS_EXTRA_SPACE}) }'` > + > + # Round up ROOTFS_SIZE to IMAGE_ROOTFS_ALIGNMENT > + ROOTFS_SIZE=`expr ${ROOTFS_SIZE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1` > + ROOTFS_SIZE=`expr ${ROOTFS_SIZE} - ${ROOTFS_SIZE} % ${IMAGE_ROOTFS_ALIGNMENT}` > + I saw a new expr failure on rootfs this morning testing with this patch, I have to dig into it to figure out what went wrong. Sau! > ${cmd} > # Now create the needed compressed versions > cd ${DEPLOY_DIR_IMAGE}/ >
Patch
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index d286eea..0bd7a6f 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -82,9 +82,13 @@ runimagecmd () { # The base_size gets calculated: # - initial size determined by `du -ks` of the IMAGE_ROOTFS # - then multiplied by the IMAGE_OVERHEAD_FACTOR - # - then rounded up to IMAGE_ROOTFS_ALIGNMENT # - finally tested against IMAGE_ROOTFS_SIZE - ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{base_size = $1 * ${IMAGE_OVERHEAD_FACTOR} + ${IMAGE_ROOTFS_ALIGNMENT} - 1; base_size -= base_size % ${IMAGE_ROOTFS_ALIGNMENT}; print ((base_size > ${IMAGE_ROOTFS_SIZE} ? base_size : ${IMAGE_ROOTFS_SIZE}) + ${IMAGE_ROOTFS_EXTRA_SPACE}) }'` + ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{base_size = $1 * ${IMAGE_OVERHEAD_FACTOR}; print ((base_size > ${IMAGE_ROOTFS_SIZE} ? base_size : ${IMAGE_ROOTFS_SIZE}) + ${IMAGE_ROOTFS_EXTRA_SPACE}) }'` + + # Round up ROOTFS_SIZE to IMAGE_ROOTFS_ALIGNMENT + ROOTFS_SIZE=`expr ${ROOTFS_SIZE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1` + ROOTFS_SIZE=`expr ${ROOTFS_SIZE} - ${ROOTFS_SIZE} % ${IMAGE_ROOTFS_ALIGNMENT}` + ${cmd} # Now create the needed compressed versions cd ${DEPLOY_DIR_IMAGE}/
If we round up ROOTFS_SIZE to IMAGE_ROOTFS_ALIGNMENT before checking if base_size is greater then IMAGE_ROOTFS_SIZE, we can end up adding an unaligned value to IMAGE_ROOTFS_SIZE. Obviously, if IMAGE_ROOTFS_EXTRA_SPACE was overwritten with an unaligned value. So let's add the round up code after the base_size calculus and it's comparison. Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> --- meta/classes/image_types.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)