Re: [Buildroot] [PATCH 1/5] toolchain-external: Fix license file management after toolchain move

From: Thomas Petazzoni via buildroot <buildroot@buildroot.org>
To: Kory Maincent <kory.maincent@bootlin.com>
Cc: buildroot@buildroot.org,
	Giulio Benetti <giulio.benetti@benettiengineering.com>,
	Romain Naour <romain.naour@gmail.com>
Subject: Re: [Buildroot] [PATCH 1/5] toolchain-external: Fix license file management after toolchain move
Date: Wed, 28 May 2025 18:40:47 +0200	[thread overview]
Message-ID: <20250528184047.3564a9db@windsurf> (raw)
In-Reply-To: <20250528-fix_license_toolchain-v1-1-34295630709b@bootlin.com>

On Wed, 28 May 2025 16:57:58 +0200
Kory Maincent <kory.maincent@bootlin.com> wrote:

> The toolchain move to TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR was
> preventing license file management from working properly. Copy license
> files back to the original toolchain directory to resolve this issue.
> 
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
>  toolchain/toolchain-external/pkg-toolchain-external.mk | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk
> index c08bf0a653..13d196a1c9 100644
> --- a/toolchain/toolchain-external/pkg-toolchain-external.mk
> +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk
> @@ -106,6 +106,11 @@ define TOOLCHAIN_EXTERNAL_MOVE
>  	rm -rf $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR)
>  	mkdir -p $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR)
>  	mv $(@D)/* $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR)/
> +	# Copy back the license files needed for legal-info generation
> +	$(foreach f, $($(PKG)_LICENSE_FILES), \
> +		[[ -d $$(dirname $(@D)/$(f)) ]] || mkdir -p $$(dirname $(@D)/$(f))
> +		cp $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR)/$(f) $(@D)/$(f)
> +	)

I am wondering if this is the right solution. The fact that we move
everything from $(@D) to $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) is
kind of weird. For all packages we don't "move" things from $(@D) to
the installation location, we rather copy stuff.

Should we do the same here? Maybe with hard links so that we don't pay
the full price of the copy?

	rsync -a --hard-link --link-dest=$(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) $(@D)

or something like this? Of course, then we should change the name of
the macro :-)

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot