* [PATCH V2 0/1] image_types.bbclass: Round up ROOTFS_SIZE after base_size check
@ 2012-09-12 20:10 Andrei Gherzan
2012-09-12 20:10 ` [PATCH V2 1/1] " Andrei Gherzan
0 siblings, 1 reply; 4+ messages in thread
From: Andrei Gherzan @ 2012-09-12 20:10 UTC (permalink / raw)
To: openembedded-core
V2:
Replace expr with awk. In this way an error like "expr: non-integer argument"
is avoided.
The following changes since commit 0f55a5868457300a3defc7fa7451ef191d19e018:
adt-installer: Allow changing YOCTOADT_REPO (2012-09-05 23:28:10 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ag/rootfs_size
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ag/rootfs_size
Andrei Gherzan (1):
image_types.bbclass: Round up ROOTFS_SIZE after base_size check
meta/classes/image_types.bbclass | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH V2 1/1] image_types.bbclass: Round up ROOTFS_SIZE after base_size check
2012-09-12 20:10 [PATCH V2 0/1] image_types.bbclass: Round up ROOTFS_SIZE after base_size check Andrei Gherzan
@ 2012-09-12 20:10 ` Andrei Gherzan
2012-09-12 20:42 ` Saul Wold
0 siblings, 1 reply; 4+ messages in thread
From: Andrei Gherzan @ 2012-09-12 20:10 UTC (permalink / raw)
To: openembedded-core
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 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index d286eea..6c01b21 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -82,9 +82,12 @@ 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=`awk "BEGIN { rootfs_size = $ROOTFS_SIZE + ${IMAGE_ROOTFS_ALIGNMENT} - 1; rootfs_size -= rootfs_size % ${IMAGE_ROOTFS_ALIGNMENT}; print rootfs_size }"`
+
${cmd}
# Now create the needed compressed versions
cd ${DEPLOY_DIR_IMAGE}/
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH V2 1/1] image_types.bbclass: Round up ROOTFS_SIZE after base_size check
2012-09-12 20:10 ` [PATCH V2 1/1] " Andrei Gherzan
@ 2012-09-12 20:42 ` Saul Wold
2012-09-12 22:45 ` Andrei Gherzan
0 siblings, 1 reply; 4+ messages in thread
From: Saul Wold @ 2012-09-12 20:42 UTC (permalink / raw)
To: Andrei Gherzan; +Cc: openembedded-core
On 09/12/2012 01:10 PM, 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 | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
> index d286eea..6c01b21 100644
> --- a/meta/classes/image_types.bbclass
> +++ b/meta/classes/image_types.bbclass
> @@ -82,9 +82,12 @@ 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=`awk "BEGIN { rootfs_size = $ROOTFS_SIZE + ${IMAGE_ROOTFS_ALIGNMENT} - 1; rootfs_size -= rootfs_size % ${IMAGE_ROOTFS_ALIGNMENT}; print rootfs_size }"`
> +
AWK seems a little heavy weight here, now we are forking it twice, since
we are already in awk above, can you not just continue the function from
there instead, maybe with a END{} or something else?
Also will this guarantee an Integer result?
> ${cmd}
> # Now create the needed compressed versions
> cd ${DEPLOY_DIR_IMAGE}/
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH V2 1/1] image_types.bbclass: Round up ROOTFS_SIZE after base_size check
2012-09-12 20:42 ` Saul Wold
@ 2012-09-12 22:45 ` Andrei Gherzan
0 siblings, 0 replies; 4+ messages in thread
From: Andrei Gherzan @ 2012-09-12 22:45 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2538 bytes --]
On Wed, Sep 12, 2012 at 11:42 PM, Saul Wold <sgw@linux.intel.com> wrote:
> On 09/12/2012 01:10 PM, 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 | 7 +++++--
>> 1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/classes/image_types.**bbclass
>> b/meta/classes/image_types.**bbclass
>> index d286eea..6c01b21 100644
>> --- a/meta/classes/image_types.**bbclass
>> +++ b/meta/classes/image_types.**bbclass
>> @@ -82,9 +82,12 @@ 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=`awk "BEGIN { rootfs_size = $ROOTFS_SIZE +
>> ${IMAGE_ROOTFS_ALIGNMENT} - 1; rootfs_size -= rootfs_size %
>> ${IMAGE_ROOTFS_ALIGNMENT}; print rootfs_size }"`
>> +
>>
>
>
> AWK seems a little heavy weight here, now we are forking it twice, since
> we are already in awk above, can you not just continue the function from
> there instead, maybe with a END{} or something else?
>
> So, to be sure i understood. You want to have the whole routine in the
same awk right? I did it this way to make those steps a little clearer. But
indeed, this is a good idea in terms of performance.
Also will this guarantee an Integer result?
>
Will fix in V3. :)
Branch updated with v3.
ag
[-- Attachment #2: Type: text/html, Size: 3453 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-12 22:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-12 20:10 [PATCH V2 0/1] image_types.bbclass: Round up ROOTFS_SIZE after base_size check Andrei Gherzan
2012-09-12 20:10 ` [PATCH V2 1/1] " Andrei Gherzan
2012-09-12 20:42 ` Saul Wold
2012-09-12 22:45 ` Andrei Gherzan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox