[PATCH v3 1/2] imagebuilder: unset BINARY_FOLDER and DOWNLOAD_FOLDER in final archive

[Baptiste Jonglez]

Hi,

On 26-04-21, Sven Roederer wrote:
> Using these config-options to customize the folders used at build-time
> makes these folder settings appear in generated archive. This causes the
> imagebuilder to be not portable, as it's going to use the build-time folders
> on the new systems. Errors look like:
> 
>   mkdir: cannot create directory '/mnt/build': Permission denied
>   Makefile:116: recipe for target '_call_image' failed
>   make[2]: *** [_call_image] Error 1
>   Makefile:241: recipe for target 'image' failed
>   make[1]: *** [image] Error 2
> 
> The build-time settings of these folders are passed into the archives via
> .config file.
> The expected behavior is that after unpacking the imagebuilder acts like
> these settings have their defaults, using intree folders. So unset the
> build-time settings.
> 
> Signed-off-by: Sven Roederer <devel-sven at geroedel.de>
> ---
>  target/imagebuilder/Makefile | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
> index f9c08776a8..ef7fd3f25e 100644
> --- a/target/imagebuilder/Makefile
> +++ b/target/imagebuilder/Makefile
> @@ -29,6 +29,8 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
>  	mkdir -p $(IB_KDIR) $(IB_LDIR) $(PKG_BUILD_DIR)/staging_dir/host/lib \
>  		$(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts $(IB_DTSDIR)
>  	-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
> +	$(SED) 's/^CONFIG_BINARY_FOLDER=.*/# CONFIG_BINARY_FOLDER was reset by Imagebuilder/' $(PKG_BUILD_DIR)/.config
> +	$(SED) 's/^CONFIG_DOWNLOAD_FOLDER=.*/# CONFIG_DOWNLOAD_FOLDER was reset by Imagebuilder/' $(PKG_BUILD_DIR)/.config

Several scripts assume that this exact format is used for disabled config:
"# CONFIG_FOO is not set" (same as in the kernel).

While your patch works [probably because these scripts are not run when
using the ImageBuilder], it seems cleaner to stick to the standard format,
e.g. in case a .config file is copied around from an imagebuilder.

Baptiste
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.openwrt.org/pipermail/openwrt-devel/attachments/20210506/1be601c9/attachment.sig>