barebox: add an option to embed environment image

From: Yegor Yefremov <yegorslists@googlemail.com>

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
 boot/barebox/Config.in  | 12 ++++++++++++
 boot/barebox/barebox.mk |  6 ++++++
 2 files changed, 18 insertions(+)

On Tue, Feb 16, 2016 at 3:34 PM,  <yegorslists@googlemail.com> wrote:
> From: Yegor Yefremov <yegorslists@googlemail.com>
>
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
> ---
>  boot/barebox/Config.in  | 12 ++++++++++++
>  boot/barebox/barebox.mk |  6 ++++++
>  2 files changed, 18 insertions(+)
>
> diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
> index 39cb5d2..5db98c6 100644
> --- a/boot/barebox/Config.in
> +++ b/boot/barebox/Config.in
> @@ -121,4 +121,16 @@ config BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH
>           barebox devfs format, stored in the images directory, with
>           the same name as the directory name given here.
>
> +config BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV
> +       bool "Embed custom environment"
> +       help
> +         Embed a custom environment image into barebox.bin.
> +
> +config BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH
> +       string "Embedded environment path"
> +       depends on BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV
> +       help
> +         Path to the directory containing the custom barebox
> +         environment.
> +
>  endif
> diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
> index 7715daf..73b73dd 100644
> --- a/boot/barebox/barebox.mk
> +++ b/boot/barebox/barebox.mk
> @@ -72,6 +72,12 @@ define BAREBOX_BUILD_BAREBOXENV_CMDS
>  endef
>  endif
>
> +ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV),y)
> +define BAREBOX_KCONFIG_FIXUP_CMDS
> +       $(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENVIRONMENT_PATH,$(call qstrip, $(BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH)),$(@D)/.config)
> +endef
> +endif
> +
>  ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_ENV),y)
>  BAREBOX_ENV_NAME = $(notdir $(call qstrip,\
>         $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)))
> --
> 2.1.4
>

After invoking make barebox-menuconfig I see following output:

make[1]: Entering directory
'/home/user/MyProjects/oss/buildroot/ar9331/build/barebox-custom'
  HOSTCC  scripts/kconfig/mconf.o
  HOSTCC  scripts/kconfig/lxdialog/checklist.o
  HOSTCC  scripts/kconfig/lxdialog/util.o
  HOSTCC  scripts/kconfig/lxdialog/inputbox.o
  HOSTCC  scripts/kconfig/lxdialog/textbox.o
  HOSTCC  scripts/kconfig/lxdialog/yesno.o
  HOSTCC  scripts/kconfig/lxdialog/menubox.o
  HOSTLD  scripts/kconfig/mconf
scripts/kconfig/mconf Kconfig


*** End of the configuration.
*** Execute 'make' to start the build or try 'make help'.

make[1]: Leaving directory
'/home/user/MyProjects/oss/buildroot/ar9331/build/barebox-custom'
rm -f /home/user/MyProjects/oss/buildroot/ar9331/build/barebox-custom/.stamp_{kconfig_fixup_done,configured,built}
rm -f /home/user/MyProjects/oss/buildroot/ar9331/build/barebox-custom/.stamp_{target,staging,images}_installed
/bin/sed -i -e "/\\<CONFIG_DEFAULT_ENVIRONMENT_PATH\\>/d"
/home/user/MyProjects/oss/buildroot/ar9331/build/barebox-custom/.config
echo 'CONFIG_DEFAULT_ENVIRONMENT_PATH=/home/user/MyProjects/oss/buildroot/bla/env'
>> /home/user/MyProjects/oss/buildroot/ar9331/build/barebox-custom/.config
make[1]: Entering directory
'/home/user/MyProjects/oss/buildroot/ar9331/build/barebox-custom'
scripts/kconfig/conf --oldconfig Kconfig

After this I examine ar9331/build/barebox-custom/.config and
CONFIG_DEFAULT_ENVIRONMENT_PATH is empty, i.e. "".

What am I doing wrong?

Yegor

On Tue, Feb 16, 2016 at 3:39 PM, Yegor Yefremov
<yegorslists@googlemail.com> wrote:
> On Tue, Feb 16, 2016 at 3:34 PM,  <yegorslists@googlemail.com> wrote:
>> From: Yegor Yefremov <yegorslists@googlemail.com>
>>
>> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
>> ---
>>  boot/barebox/Config.in  | 12 ++++++++++++
>>  boot/barebox/barebox.mk |  6 ++++++
>>  2 files changed, 18 insertions(+)
>>
>> diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
>> index 39cb5d2..5db98c6 100644
>> --- a/boot/barebox/Config.in
>> +++ b/boot/barebox/Config.in
>> @@ -121,4 +121,16 @@ config BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH
>>           barebox devfs format, stored in the images directory, with
>>           the same name as the directory name given here.
>>
>> +config BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV
>> +       bool "Embed custom environment"
>> +       help
>> +         Embed a custom environment image into barebox.bin.
>> +
>> +config BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH
>> +       string "Embedded environment path"
>> +       depends on BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV
>> +       help
>> +         Path to the directory containing the custom barebox
>> +         environment.
>> +
>>  endif
>> diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
>> index 7715daf..73b73dd 100644
>> --- a/boot/barebox/barebox.mk
>> +++ b/boot/barebox/barebox.mk
>> @@ -72,6 +72,12 @@ define BAREBOX_BUILD_BAREBOXENV_CMDS
>>  endef
>>  endif
>>
>> +ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV),y)
>> +define BAREBOX_KCONFIG_FIXUP_CMDS
>> +       $(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENVIRONMENT_PATH,$(call qstrip, $(BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH)),$(@D)/.config)

qstrip is wrong here ...

The question is should I make an "order" selection for
embedded/external image and just use the existing
BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH?

Yegor