Patchwork [1/1] module.bbclass: make sure do_make_scripts() executes after do_patch()

login
mail settings
Submitter Tom Zanussi
Date Dec. 14, 2012, 5:27 a.m.
Message ID <e7a95fde7267ebf9a1567d3f3aa1e459e12a5fea.1355462107.git.tom.zanussi@intel.com>
Download mbox | patch
Permalink /patch/40975/
State Accepted
Commit 824cf145bcb55bb99a717a2dfd73e43e6b3feea4
Headers show

Comments

Tom Zanussi - Dec. 14, 2012, 5:27 a.m.
From: Tom Zanussi <tom.zanussi@intel.com>

If do_make_scripts() executes before do_unpack()/do_patch(), the build
fails because it can't cd into the workdir of a recipe using this
class, so make sure do_make_scripts() doesn't run before the package
has been unpacked and patched.

Fixes [YOCTO #3589].

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta/classes/module.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Bruce Ashfield - Dec. 14, 2012, 5:31 a.m.
On 12-12-14 12:27 AM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi<tom.zanussi@intel.com>
>
> If do_make_scripts() executes before do_unpack()/do_patch(), the build
> fails because it can't cd into the workdir of a recipe using this
> class, so make sure do_make_scripts() doesn't run before the package
> has been unpacked and patched.

I've never seen the problem myself, but having a more tightly defined
ordering for the task is a good thing in my books.

Since you aren't breaking the working use case, I have no objection.

So I'll throw out a fancy: Reviewed-by: Bruce Ashfield 
<bruce.ashfield@windriver.com>

Cheers,

Bruce

>
> Fixes [YOCTO #3589].
>
> Signed-off-by: Tom Zanussi<tom.zanussi@intel.com>
> ---
>   meta/classes/module.bbclass |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
> index e8d32eb..ebb0880 100644
> --- a/meta/classes/module.bbclass
> +++ b/meta/classes/module.bbclass
> @@ -3,7 +3,7 @@ DEPENDS += "virtual/kernel"
>
>   inherit module-base
>
> -addtask make_scripts before do_compile
> +addtask make_scripts after do_patch before do_compile
>   do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
>   do_make_scripts[deptask] = "do_populate_sysroot"
>

Patch

diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index e8d32eb..ebb0880 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -3,7 +3,7 @@  DEPENDS += "virtual/kernel"
 
 inherit module-base
 
-addtask make_scripts before do_compile
+addtask make_scripts after do_patch before do_compile
 do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
 do_make_scripts[deptask] = "do_populate_sysroot"