[PATCH] fixup! defaultenv: generate force-built-in (zero) environment file

[PATCH] fixup! defaultenv: generate force-built-in (zero) environment file

[Masahiro Yamada]

---

Without this, out-of-tree build (O=option) fails.

Sascha,
Please squash this before you merge the next branches into the mainline.



 defaultenv/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaultenv/Makefile b/defaultenv/Makefile
index 8a001ec..33e0ece 100644
--- a/defaultenv/Makefile
+++ b/defaultenv/Makefile
@@ -24,7 +24,7 @@ $(obj)/barebox_default_env.h: $(obj)/barebox_default_env$(DEFAULT_COMPRESSION_SU
 	$(call if_changed,env_h)
 
 quiet_cmd_env_zero = ENVZ    $@
-cmd_env_zero = ($(srctree)/scripts/bareboxenv -z $(CONFIG_DEFAULT_ENVIRONMENT_PATH) $@)
+cmd_env_zero = ($(objtree)/scripts/bareboxenv -z $(CONFIG_DEFAULT_ENVIRONMENT_PATH) $@)
 
 $(obj)/barebox_zero_env: FORCE
 	$(call cmd,env_zero)
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] fixup! defaultenv: generate force-built-in (zero) environment file

[Sascha Hauer]

On Tue, Feb 03, 2015 at 06:45:39PM +0900, Masahiro Yamada wrote:
> ---
> 
> Without this, out-of-tree build (O=option) fails.
> 
> Sascha,
> Please squash this before you merge the next branches into the mainline.

Just did that.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] fixup! defaultenv: generate force-built-in (zero) environment file

[Jan Lübbe]

On Di, 2015-02-03 at 18:45 +0900, Masahiro Yamada wrote:
> Without this, out-of-tree build (O=option) fails.
> 
> diff --git a/defaultenv/Makefile b/defaultenv/Makefile
> index 8a001ec..33e0ece 100644
> --- a/defaultenv/Makefile
> +++ b/defaultenv/Makefile
> @@ -24,7 +24,7 @@ $(obj)/barebox_default_env.h: $(obj)/barebox_default_env$(DEFAULT_COMPRESSION_SU
>  	$(call if_changed,env_h)
>  
>  quiet_cmd_env_zero = ENVZ    $@
> -cmd_env_zero = ($(srctree)/scripts/bareboxenv -z $(CONFIG_DEFAULT_ENVIRONMENT_PATH) $@)
> +cmd_env_zero = ($(objtree)/scripts/bareboxenv -z $(CONFIG_DEFAULT_ENVIRONMENT_PATH) $@)

I adapted this from the same file a few lines above:
quiet_cmd_env_default = ENV     $@
cmd_env_default = ($(srctree)/scripts/genenv $(srctree) $(objtree) $@ $(CONFIG_DEFAULT_ENVIRONMENT_PATH))

Why didn't this fail for your?

Regards,
Jan
-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] fixup! defaultenv: generate force-built-in (zero) environment file

[Masahiro YAMADA]

Hi Jan,


2015-02-04 23:39 GMT+09:00 Jan Lübbe <jlu@pengutronix.de>:
> On Di, 2015-02-03 at 18:45 +0900, Masahiro Yamada wrote:
>> Without this, out-of-tree build (O=option) fails.
>>
>> diff --git a/defaultenv/Makefile b/defaultenv/Makefile
>> index 8a001ec..33e0ece 100644
>> --- a/defaultenv/Makefile
>> +++ b/defaultenv/Makefile
>> @@ -24,7 +24,7 @@ $(obj)/barebox_default_env.h: $(obj)/barebox_default_env$(DEFAULT_COMPRESSION_SU
>>       $(call if_changed,env_h)
>>
>>  quiet_cmd_env_zero = ENVZ    $@
>> -cmd_env_zero = ($(srctree)/scripts/bareboxenv -z $(CONFIG_DEFAULT_ENVIRONMENT_PATH) $@)
>> +cmd_env_zero = ($(objtree)/scripts/bareboxenv -z $(CONFIG_DEFAULT_ENVIRONMENT_PATH) $@)
>
> I adapted this from the same file a few lines above:
> quiet_cmd_env_default = ENV     $@
> cmd_env_default = ($(srctree)/scripts/genenv $(srctree) $(objtree) $@ $(CONFIG_DEFAULT_ENVIRONMENT_PATH))
>
> Why didn't this fail for your?
>

scripts/getenv is a shell script.
It resides in the source directory.


On the other hand, scripts/bareboxenv is a C program
that is compiled from bareboxenv.c.


That's the difference.



-- 
Best Regards
Masahiro Yamada

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox