[linux] 03/03: Revert "Compile with gcc-7 on all architectures"

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch stretch-backports
in repository linux.

commit 181f3cd32b3d76d75813a62b230c0ed0fd7e0812
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Dec 22 16:32:51 2017 +0000

    Revert "Compile with gcc-7 on all architectures"
    
    This reverts commit 5dfe04c507c1f316e976e598d2e6917f34b60eb0.
    gcc-7 is not available in stretch.
---
 debian/changelog                  |  1 +
 debian/config/amd64/defines       |  2 +-
 debian/config/armel/defines       |  2 +-
 debian/config/armhf/defines       |  2 +-
 debian/config/defines             |  4 ++--
 debian/config/hppa/defines        |  2 +-
 debian/config/i386/defines        |  2 +-
 debian/config/s390x/defines       |  2 +-
 debian/templates/control.extra.in | 12 ++++++------
 9 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 196aa52..a794c47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux (4.14.7-1~bpo9+1) UNRELEASED; urgency=medium
 
   * Rebuild for stretch-backports:
     - Change ABI number to 0.bpo.2
+    - Revert changes to use gcc-7 compiler, not found in stretch
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 22 Dec 2017 16:31:14 +0000
 
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 297066d..e15f609 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-7: linux-compiler-gcc-7-x86
+headers%gcc-6: linux-compiler-gcc-6-x86
 
 [amd64_description]
 hardware: 64-bit PCs
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index b6f172d..9f4ed16 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -16,7 +16,7 @@ uncompressed-image-file: arch/arm/boot/Image
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-7: linux-compiler-gcc-7-arm
+headers%gcc-6: linux-compiler-gcc-6-arm
 
 [marvell_description]
 hardware: Marvell Kirkwood/Orion
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index 497f6bb..6cb4658 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -12,7 +12,7 @@ vdso: true
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-7: linux-compiler-gcc-7-arm
+headers%gcc-6: linux-compiler-gcc-6-arm
 
 [armmp_description]
 hardware: ARMv7 multiplatform compatible SoCs
diff --git a/debian/config/defines b/debian/config/defines
index f52baad..d17ace6 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -99,7 +99,7 @@ arches:
  sparc64
  tilegx
  x32
-compiler: gcc-7
+compiler: gcc-6
 featuresets:
  none
  rt
@@ -124,7 +124,7 @@ recommends: apparmor
 
 [relations]
 # compilers
-gcc-7: gcc-7 <!stage1 !cross>, gcc-7- at gnu-type-package@ <!stage1 cross>
+gcc-6: gcc-6 <!stage1 !cross>, gcc-6- at gnu-type-package@ <!stage1 cross>
 
 # initramfs-generators
 initramfs-fallback: linux-initramfs-tool
diff --git a/debian/config/hppa/defines b/debian/config/hppa/defines
index 761bda6..8eac51d 100644
--- a/debian/config/hppa/defines
+++ b/debian/config/hppa/defines
@@ -24,5 +24,5 @@ hardware: multiprocessor 64-bit PA-RISC
 hardware-long: HP PA-RISC 64-bit SMP systems with support for more than 4 GB RAM
 
 [relations]
-gcc-7: gcc-7 <!stage1 !cross>, binutils-hppa64-linux-gnu <!stage1 !cross>, gcc-7-hppa64-linux-gnu <!stage1 !cross>, gcc-7-hppa-linux-gnu <!stage1 cross>, binutils-hppa64-linux-gnu <!stage1 cross>, gcc-7-hppa64-linux-gnu <!stage1 cross>
+gcc-6: gcc-6 <!stage1 !cross>, binutils-hppa64-linux-gnu <!stage1 !cross>, gcc-6-hppa64-linux-gnu <!stage1 !cross>, gcc-6-hppa-linux-gnu <!stage1 cross>, binutils-hppa64-linux-gnu <!stage1 cross>, gcc-6-hppa64-linux-gnu <!stage1 cross>
 
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 880ad44..1123508 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -20,7 +20,7 @@ install-stem: vmlinuz
 breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
 
 [relations]
-headers%gcc-7: linux-compiler-gcc-7-x86
+headers%gcc-6: linux-compiler-gcc-6-x86
 
 [686_description]
 hardware: older PCs
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index 47de624..8dcf9fd 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -12,7 +12,7 @@ bootloaders: s390-tools
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-7: linux-compiler-gcc-7-s390
+headers%gcc-6: linux-compiler-gcc-6-s390
 
 [s390x_build]
 debug-info: true
diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in
index d437968..b0f3e86 100644
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -1,24 +1,24 @@
-Package: linux-compiler-gcc-7-arm
+Package: linux-compiler-gcc-6-arm
 Build-Profiles: <!stage1>
-Depends: gcc-7, ${misc:Depends}
+Depends: gcc-6, ${misc:Depends}
 Architecture: armel armhf
 Multi-Arch: foreign
 Description: Compiler for Linux on ARM (meta-package)
  This package depends on gcc 6 of the appropriate architecture for
  Linux on armel and armhf.
 
-Package: linux-compiler-gcc-7-s390
+Package: linux-compiler-gcc-6-s390
 Build-Profiles: <!stage1>
-Depends: gcc-7, ${misc:Depends}
+Depends: gcc-6, ${misc:Depends}
 Architecture: s390 s390x
 Multi-Arch: foreign
 Description: Compiler for Linux on IBM zSeries (meta-package)
  This package depends on gcc 6 of the appropriate architecture for
  Linux on s390 and s390x.
 
-Package: linux-compiler-gcc-7-x86
+Package: linux-compiler-gcc-6-x86
 Build-Profiles: <!stage1>
-Depends: gcc-7, ${misc:Depends}
+Depends: gcc-6, ${misc:Depends}
 Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Description: Compiler for Linux on x86 (meta-package)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git