Revert "Compile with gcc-11 on all architectures"

This reverts commit 644250a54ffd92d1c17efe207070899b680ac0a1.

9 files changed, 16 insertions, 16 deletions

diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 975efaa90..b278f3622 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -15,7 +15,7 @@ install-stem: vmlinuz
 breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
 
 [relations]
-headers%gcc-11: linux-compiler-gcc-11-x86
+headers%gcc-10: linux-compiler-gcc-10-x86
 
 [amd64_description]
 hardware: 64-bit PCs
diff --git a/debian/config/arm64/defines b/debian/config/arm64/defines
index dec69491a..a61d02a4b 100644
--- a/debian/config/arm64/defines
+++ b/debian/config/arm64/defines
@@ -24,5 +24,5 @@ hardware-long: cloud platforms supporting arm64 virtual machines
 [arm64_image]
 
 [relations]
-gcc-11: gcc-11 <!stage1 !cross !pkg.linux.nokernel>, gcc-11-aarch64-linux-gnu <!stage1 cross !pkg.linux.nokernel>, gcc-arm-linux-gnueabihf <!stage1 !pkg.linux.nokernel>
-headers%gcc-11: gcc-11
+gcc-10: gcc-10 <!stage1 !cross !pkg.linux.nokernel>, gcc-10-aarch64-linux-gnu <!stage1 cross !pkg.linux.nokernel>, gcc-arm-linux-gnueabihf <!stage1 !pkg.linux.nokernel>
+headers%gcc-10: gcc-10
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index 031067afd..59d05e5f2 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -13,7 +13,7 @@ uncompressed-image-file: arch/arm/boot/Image
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-11: linux-compiler-gcc-11-arm
+headers%gcc-10: linux-compiler-gcc-10-arm
 
 [marvell_description]
 hardware: Marvell Kirkwood/Orion
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index 7607ea2d9..1050d8212 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -12,7 +12,7 @@ vdso: true
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-11: linux-compiler-gcc-11-arm
+headers%gcc-10: linux-compiler-gcc-10-arm
 
 [armmp_description]
 hardware: ARMv7 multiplatform compatible SoCs
diff --git a/debian/config/defines b/debian/config/defines
index 4739564d1..f9e0ca177 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -142,7 +142,7 @@ arches:
  sparc
  sparc64
  x32
-compiler: gcc-11
+compiler: gcc-10
 featuresets:
  none
  rt
@@ -166,7 +166,7 @@ recommends: apparmor
 
 [relations]
 # compilers
-gcc-11: gcc-11 <!stage1 !cross !pkg.linux.nokernel>, gcc-11-@gnu-type-package@ <!stage1 cross !pkg.linux.nokernel>
+gcc-10: gcc-10 <!stage1 !cross !pkg.linux.nokernel>, gcc-10-@gnu-type-package@ <!stage1 cross !pkg.linux.nokernel>
 
 # initramfs-generators
 initramfs-fallback: linux-initramfs-tool
diff --git a/debian/config/hppa/defines b/debian/config/hppa/defines
index a7721f8f6..3850c86ae 100644
--- a/debian/config/hppa/defines
+++ b/debian/config/hppa/defines
@@ -23,5 +23,5 @@ hardware: 64-bit PA-RISC
 hardware-long: HP PA-RISC 64-bit systems with support for more than 4 GB RAM
 
 [relations]
-gcc-11: gcc-11 <!stage1 !cross !pkg.linux.nokernel>, gcc-11-hppa-linux-gnu <!stage1 cross !pkg.linux.nokernel>, binutils-hppa64-linux-gnu <!stage1 !pkg.linux.nokernel>, gcc-11-hppa64-linux-gnu <!stage1 !pkg.linux.nokernel>
+gcc-10: gcc-10 <!stage1 !cross !pkg.linux.nokernel>, gcc-10-hppa-linux-gnu <!stage1 cross !pkg.linux.nokernel>, binutils-hppa64-linux-gnu <!stage1 !pkg.linux.nokernel>, gcc-10-hppa64-linux-gnu <!stage1 !pkg.linux.nokernel>
 
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index d471d747d..f86e91d61 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -21,7 +21,7 @@ install-stem: vmlinuz
 breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
 
 [relations]
-headers%gcc-11: linux-compiler-gcc-11-x86
+headers%gcc-10: linux-compiler-gcc-10-x86
 
 [686_description]
 hardware: older PCs
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index 922bd1aca..ec8825526 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -13,7 +13,7 @@ bootloaders: s390-tools
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-11: linux-compiler-gcc-11-s390
+headers%gcc-10: linux-compiler-gcc-10-s390
 
 [s390x_description]
 hardware: IBM zSeries
diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in
index d176e8e51..ef9015127 100644
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -1,24 +1,24 @@
-Package: linux-compiler-gcc-11-arm
+Package: linux-compiler-gcc-10-arm
 Build-Profiles: <!stage1>
-Depends: gcc-11, ${misc:Depends}
+Depends: gcc-10, ${misc:Depends}
 Architecture: armel armhf
 Multi-Arch: foreign
 Description: Compiler for Linux on ARM (meta-package)
  This package depends on GCC of the appropriate version and architecture
  for Linux on armel and armhf.
 
-Package: linux-compiler-gcc-11-s390
+Package: linux-compiler-gcc-10-s390
 Build-Profiles: <!stage1>
-Depends: gcc-11, ${misc:Depends}
+Depends: gcc-10, ${misc:Depends}
 Architecture: s390 s390x
 Multi-Arch: foreign
 Description: Compiler for Linux on IBM zSeries (meta-package)
  This package depends on GCC of the appropriate version and architecture
  for Linux on s390 and s390x.
 
-Package: linux-compiler-gcc-11-x86
+Package: linux-compiler-gcc-10-x86
 Build-Profiles: <!stage1>
-Depends: gcc-11, ${misc:Depends}
+Depends: gcc-10, ${misc:Depends}
 Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Description: Compiler for Linux on x86 (meta-package)