Patchwork build-appliance-image: Simplify fetch/unpack execution

login
register
mail settings
Submitter Richard Purdie
Date Nov. 20, 2012, 1:17 p.m.
Message ID <1353417464.23758.6.camel@ted>
Download mbox | patch
Permalink /patch/39345/
State Accepted
Commit 15743528b2f0b5560f18e3925ae11a98dcfc2619
Headers show

Comments

Richard Purdie - Nov. 20, 2012, 1:17 p.m.
This provides a slightly neater way of ensuring fetch/unpack get
executed (image.bbclass marks them as noexec) since I found the
current approach harder to understand at first glance.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Otavio Salvador - Nov. 20, 2012, 1:31 p.m.
On Tue, Nov 20, 2012 at 11:17 AM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> This provides a slightly neater way of ensuring fetch/unpack get
> executed (image.bbclass marks them as noexec) since I found the
> current approach harder to understand at first glance.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>

Agreed.


> ---
> diff --git a/meta/recipes-core/images/build-appliance-image.bbb/meta/recipes-core/images/
> build-appliance-image.bb
> index 59ccb98..bf1e585 100644
> --- a/meta/recipes-core/images/build-appliance-image.bb
> +++ b/meta/recipes-core/images/build-appliance-image.bb
> @@ -68,11 +68,11 @@ fakeroot do_populate_poky_src () {
>
>  IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
>
> -python do_get_poky_src () {
> -    bb.build.exec_func('base_do_fetch', d)
> -    bb.build.exec_func('base_do_unpack', d)
> +python () {
> +       # Ensure we run these usually noexec tasks
> +       d.delVarFlag("do_fetch", "noexec")
> +       d.delVarFlag("do_unpack", "noexec")
>  }
> -addtask do_get_poky_src before do_rootfs
>

I'd say for include a comment in code so it is easy to understand why
you're drpping the flag.


>  create_bundle_files () {
>         cd ${WORKDIR}
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/recipes-core/images/build-appliance-image.bb b/meta/recipes-core/images/build-appliance-image.bb
index 59ccb98..bf1e585 100644
--- a/meta/recipes-core/images/build-appliance-image.bb
+++ b/meta/recipes-core/images/build-appliance-image.bb
@@ -68,11 +68,11 @@  fakeroot do_populate_poky_src () {
 
 IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
 
-python do_get_poky_src () {
-    bb.build.exec_func('base_do_fetch', d)
-    bb.build.exec_func('base_do_unpack', d)
+python () {
+	# Ensure we run these usually noexec tasks
+	d.delVarFlag("do_fetch", "noexec")
+	d.delVarFlag("do_unpack", "noexec")
 }
-addtask do_get_poky_src before do_rootfs
 
 create_bundle_files () {
 	cd ${WORKDIR}