[SRU][K/raspi][PATCH 2/3] UBUNTU: Revert "UBUNTU: [Packaging] raspi: Use gcc-11 for armhf"

[Juerg Haefliger]

BugLink: https://bugs.launchpad.net/bugs/1995853

This reverts commit 3d15b0e601a672a7f915cf15f071ef59fd4e9090.

Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
---
 debian/rules.d/0-common-vars.mk  | 9 ++-------
 debian/scripts/misc/kernelconfig | 9 +--------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index f7a0bdc41a22..1d8f8b85772f 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -119,13 +119,8 @@ CROSS_COMPILE ?= $(DEB_HOST_GNU_TYPE)-
 # If a given kernel wants to change this, they can do so via their own
 # $(DEBIAN)/rules.d/hooks.mk and $(DEBIAN)/rules.d/$(arch).mk files
 #
-# FIXME (juergh): Use gcc-11 for armhf
-ifeq ($(arch),armhf)
-export gcc := gcc-11
-else
-export gcc := gcc-12
-endif
-GCC_BUILD_DEPENDS=\ gcc-12 [arm64], gcc-11 [armhf], gcc-12-aarch64-linux-gnu [arm64] <cross>, gcc-11-arm-linux-gnueabihf [armhf] <cross>,
+export gcc?=gcc-12
+GCC_BUILD_DEPENDS=\ $(gcc), $(gcc)-aarch64-linux-gnu [arm64] <cross>, $(gcc)-arm-linux-gnueabihf [armhf] <cross>, $(gcc)-powerpc64le-linux-gnu [ppc64el] <cross>, $(gcc)-riscv64-linux-gnu [riscv64] <cross>, $(gcc)-s390x-linux-gnu [s390x] <cross>, $(gcc)-x86-64-linux-gnu [amd64] <cross>,
 
 abidir		:= $(CURDIR)/$(DEBIAN)/__abi.current/$(arch)
 prev_abidir	:= $(CURDIR)/$(DEBIAN)/abi/$(arch)
diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
index 2db4b719db6d..44c1b79d9765 100755
--- a/debian/scripts/misc/kernelconfig
+++ b/debian/scripts/misc/kernelconfig
@@ -67,13 +67,6 @@ for arch in $archs; do
 	# Determine cross toolchain to use for Kconfig compiler tests
 	cross_compile="$(dpkg-architecture -qDEB_HOST_GNU_TYPE -a$arch 2>/dev/null)-"
 
-	# FIXME (juergh): Use gcc-11 for armhf
-	if [ "${kernarch}" = "arm" ] ; then
-		gcc=gcc-11
-	else
-		gcc=gcc-12
-	fi
-
 	# Environment variables for 'make *config'. We omit CROSS_COMPILE
 	# for i386 since it is no longer supported after 19.04, however
 	# we maintain the configs for hwe.
@@ -83,7 +76,7 @@ for arch in $archs; do
 	if [ "$compiler_path" != '' ]; then
 		env="$env CROSS_COMPILE=$cross_compile CC=$compiler_path"
 	else
-		echo "WARNING: ${cross_compile}${gcc} not installed"
+		echo "WARNING: ${cross_compile}gcc not installed"
 		modify_config=
 		warning_partial="$warning_partial $arch"
 	fi
-- 
2.34.1