[Buildroot] [PATCH] package: Rename and update arm-gnu-a-toolchain to arm-gnu-toolchain

[Arnout Vandecappelle]

On 31/05/2022 16:35, Kory Maincent via buildroot wrote:
> From: Kory Maincent <kory.maincent at bootlin.com>
> 
> arm-gnu-a-toolchain is now deprecated to be replaced by arm-gnu-toolchain.
> This patch rename the package and update to the new version.
> It also update TF-A package that depends on it.
> 
> Signed-off-by: Kory Maincent <kory.maincent at bootlin.com>

  Applied to master, after adding the links mentioned by Thomas and also 
updating the comment in the .mk file, thanks.

  Regards,
  Arnout

> ---
>   DEVELOPERS                                    |  2 +-
>   .../arm-trusted-firmware.mk                   |  2 +-
>   .../arm-gnu-a-toolchain.hash                  |  2 --
>   .../arm-gnu-a-toolchain.mk                    | 26 -------------------
>   .../arm-gnu-toolchain/arm-gnu-toolchain.hash  |  2 ++
>   .../arm-gnu-toolchain/arm-gnu-toolchain.mk    | 26 +++++++++++++++++++
>   6 files changed, 30 insertions(+), 30 deletions(-)
>   delete mode 100644 package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.hash
>   delete mode 100644 package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.mk
>   create mode 100644 package/arm-gnu-toolchain/arm-gnu-toolchain.hash
>   create mode 100644 package/arm-gnu-toolchain/arm-gnu-toolchain.mk
> 
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 71cc3da6d7..bc3e6f7eae 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -2703,7 +2703,7 @@ F:	configs/rock_pi_4_defconfig
>   F:	configs/rock_pi_n8_defconfig
>   F:	configs/rock_pi_n10_defconfig
>   F:	configs/rockpro64_defconfig
> -F:	package/arm-gnu-a-toolchain/
> +F:	package/arm-gnu-toolchain/
>   
>   N:	Sven Haardiek <sven.haardiek at iotec-gmbh.de>
>   F:	package/lcdproc/
> diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
> index 03fa83b7b5..38655a70a0 100644
> --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
> +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
> @@ -36,7 +36,7 @@ ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-dtc
>   endif
>   
>   ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN),y)
> -ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-arm-gnu-a-toolchain
> +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-arm-gnu-toolchain
>   endif
>   
>   ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM))
> diff --git a/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.hash b/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.hash
> deleted file mode 100644
> index 73c2708fea..0000000000
> --- a/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.hash
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -# Locally calculated
> -sha256 45225813f74e0c3f76af2715d30d1fbebb873c1abe7098f9c694e5567cc2279c  gcc-arm-10.3-2021.07-x86_64-arm-none-eabi.tar.xz
> diff --git a/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.mk b/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.mk
> deleted file mode 100644
> index 97ab89c9eb..0000000000
> --- a/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.mk
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -################################################################################
> -#
> -# arm-gnu-a-toolchain
> -#
> -################################################################################
> -
> -ARM_GNU_A_TOOLCHAIN_VERSION = 10.3-2021.07
> -ARM_GNU_A_TOOLCHAIN_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/$(ARM_GNU_A_TOOLCHAIN_VERSION)/binrel
> -ARM_GNU_A_TOOLCHAIN_SOURCE = gcc-arm-$(ARM_GNU_A_TOOLCHAIN_VERSION)-x86_64-arm-none-eabi.tar.xz
> -ARM_GNU_A_TOOLCHAIN_LICENSE = GPL-3.0+
> -
> -HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR = $(HOST_DIR)/opt/gcc-arm-none-eabi
> -
> -define HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_CMDS
> -	rm -rf $(HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR)
> -	mkdir -p $(HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR)
> -	cp -rf $(@D)/* $(HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR)/
> -
> -	mkdir -p $(HOST_DIR)/bin
> -	cd $(HOST_DIR)/bin && \
> -	for i in ../opt/gcc-arm-none-eabi/bin/*; do \
> -		ln -sf $$i; \
> -	done
> -endef
> -
> -$(eval $(host-generic-package))
> diff --git a/package/arm-gnu-toolchain/arm-gnu-toolchain.hash b/package/arm-gnu-toolchain/arm-gnu-toolchain.hash
> new file mode 100644
> index 0000000000..48b1b55c73
> --- /dev/null
> +++ b/package/arm-gnu-toolchain/arm-gnu-toolchain.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256 8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326  gcc-arm-11.2-2022.02-x86_64-arm-none-eabi.tar.xz
> diff --git a/package/arm-gnu-toolchain/arm-gnu-toolchain.mk b/package/arm-gnu-toolchain/arm-gnu-toolchain.mk
> new file mode 100644
> index 0000000000..9beef42ac4
> --- /dev/null
> +++ b/package/arm-gnu-toolchain/arm-gnu-toolchain.mk
> @@ -0,0 +1,26 @@
> +################################################################################
> +#
> +# arm-gnu-a-toolchain
> +#
> +################################################################################
> +
> +ARM_GNU_TOOLCHAIN_VERSION = 11.2-2022.02
> +ARM_GNU_TOOLCHAIN_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(ARM_GNU_TOOLCHAIN_VERSION)/binrel/
> +ARM_GNU_TOOLCHAIN_SOURCE = gcc-arm-$(ARM_GNU_TOOLCHAIN_VERSION)-x86_64-arm-none-eabi.tar.xz
> +ARM_GNU_TOOLCHAIN_LICENSE = GPL-3.0+
> +
> +HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR = $(HOST_DIR)/opt/gcc-arm-none-eabi
> +
> +define HOST_ARM_GNU_TOOLCHAIN_INSTALL_CMDS
> +	rm -rf $(HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR)
> +	mkdir -p $(HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR)
> +	cp -rf $(@D)/* $(HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR)/
> +
> +	mkdir -p $(HOST_DIR)/bin
> +	cd $(HOST_DIR)/bin && \
> +	for i in ../opt/gcc-arm-none-eabi/bin/*; do \
> +		ln -sf $$i; \
> +	done
> +endef
> +
> +$(eval $(host-generic-package))