[PATCH] cml1.bbclass: explicitly set workdir

[PATCH] cml1.bbclass: explicitly set workdir

[André Draszik]

bitbake rev 67a7b8b02 "build: don't use $B as the default cwd for
functions" (included in current bitbake master) breaks the assumption
that do_menuconfig / do_diffconfig run inside the build directory.

This causes these tasks to fail as they're being executed in the
wrong directory.

Set workdir explicitly.

Signed-off-by: André Draszik <git@andred.net>
---
 meta/classes/cml1.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index 5834806..4b3b916 100644
--- a/meta/classes/cml1.bbclass
+++ b/meta/classes/cml1.bbclass
@@ -41,6 +41,7 @@ python do_menuconfig() {
             bb.build.write_taint('do_compile', d)
 }
 do_menuconfig[depends] += "ncurses-native:do_populate_sysroot"
+do_menuconfig[dirs] = "${B}"
 do_menuconfig[nostamp] = "1"
 do_menuconfig[dirs] = "${B}"
 addtask menuconfig after do_configure
@@ -72,7 +73,7 @@ python do_diffconfig() {
         if os.path.exists(fragment):
             os.unlink(fragment)
 }
-
+do_diffconfig[dirs] = "${B}"
 do_diffconfig[nostamp] = "1"
 do_diffconfig[dirs] = "${B}"
 addtask diffconfig
-- 
2.8.1

Re: [PATCH] cml1.bbclass: explicitly set workdir

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

On 5 August 2016 at 10:34, André Draszik <git@andred.net> wrote:

> bitbake rev 67a7b8b02 "build: don't use $B as the default cwd for
> functions" (included in current bitbake master) breaks the assumption
> that do_menuconfig / do_diffconfig run inside the build directory.
>

Already merged into master with 614d976ee97d6386c37afb54add5b83741ca401e.

Ross

[-- Attachment #2: Type: text/html, Size: 818 bytes --]

Re: [PATCH] cml1.bbclass: explicitly set workdir

[André Draszik]

Sorry, please ignore this! Didn't realise it's fixed in oe-core just not in
poky.git yet.

On Fri, 2016-08-05 at 10:34 +0100, André Draszik wrote:
> bitbake rev 67a7b8b02 "build: don't use $B as the default cwd for
> functions" (included in current bitbake master) breaks the assumption
> that do_menuconfig / do_diffconfig run inside the build directory.
> 
> This causes these tasks to fail as they're being executed in the
> wrong directory.
> 
> Set workdir explicitly.
> 
> Signed-off-by: André Draszik <git@andred.net>
> ---
>  meta/classes/cml1.bbclass | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
> index 5834806..4b3b916 100644
> --- a/meta/classes/cml1.bbclass
> +++ b/meta/classes/cml1.bbclass
> @@ -41,6 +41,7 @@ python do_menuconfig() {
>              bb.build.write_taint('do_compile', d)
>  }
>  do_menuconfig[depends] += "ncurses-native:do_populate_sysroot"
> +do_menuconfig[dirs] = "${B}"
>  do_menuconfig[nostamp] = "1"
>  do_menuconfig[dirs] = "${B}"
>  addtask menuconfig after do_configure
> @@ -72,7 +73,7 @@ python do_diffconfig() {
>          if os.path.exists(fragment):
>              os.unlink(fragment)
>  }
> -
> +do_diffconfig[dirs] = "${B}"
>  do_diffconfig[nostamp] = "1"
>  do_diffconfig[dirs] = "${B}"
>  addtask diffconfig

Re: [PATCH] cml1.bbclass: explicitly set workdir

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 265 bytes --]

On 5 August 2016 at 10:40, André Draszik <git@andred.net> wrote:

> Sorry, please ignore this! Didn't realise it's fixed in oe-core just not in
> poky.git yet.
>

Merges happen to both at the same time generally, but you likely missed it
by hours.

Ross

[-- Attachment #2: Type: text/html, Size: 662 bytes --]