[linux] 01/01: Revert "debian/control: Relax cross-compiler build-dependencies, now that #827136 is fixed"

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux.

commit 55947fe980038298021d2fad5d55af2a4269f2c4
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Jul 14 13:34:20 2016 +0100

    Revert "debian/control: Relax cross-compiler build-dependencies, now that #827136 is fixed"
    
    This reverts commit f513bc42ae9e19a983e14e1060b66033a70ac928.  Bug
---
 debian/changelog           | 2 --
 debian/config/defines      | 2 +-
 debian/config/hppa/defines | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2921764..9d907f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,6 @@ linux (4.7~rc7-1~exp1) UNRELEASED; urgency=medium
   * [armhf, arm64] Enable DRM_TEGRA_STAGING.
 
   [ Ben Hutchings ]
-  * debian/control: Relax cross-compiler build-dependencies, now that #827136
-    is fixed
   * [x86] KASLR, power: Remove x86 hibernation restrictions
   * fanotify: Enable FANOTIFY_ACCESS_PERMISSIONS (Closes: #690737)
     - Warn and taint kernel if this feature is actually used
diff --git a/debian/config/defines b/debian/config/defines
index 109da0f..5b35a8d 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -60,7 +60,7 @@ initramfs-generators: initramfs-tools initramfs-fallback
 
 [relations]
 # compilers
-gcc-5: gcc-5 <!stage1 !cross>, gcc-5- at gnu-type-package@ <!stage1 cross>
+gcc-5: gcc-5 <!stage1 !cross>, gcc-5- at gnu-type-package@:native <!stage1 cross>
 
 # initramfs-generators
 initramfs-fallback: linux-initramfs-tool
diff --git a/debian/config/hppa/defines b/debian/config/hppa/defines
index 059c387..9b139c6 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-5: gcc-5 <!stage1 !cross>, gcc-5-hppa-linux-gnu <!stage1 cross>, binutils-hppa64-linux-gnu <!stage1>, gcc-5-hppa64-linux-gnu <!stage1>
+gcc-5: gcc-5 <!stage1 !cross>, binutils-hppa64-linux-gnu <!stage1 !cross>, gcc-5-hppa64-linux-gnu <!stage1 !cross>, gcc-5-hppa-linux-gnu:native <!stage1 cross>, binutils-hppa64-linux-gnu:native <!stage1 cross>, gcc-5-hppa64-linux-gnu:native <!stage1 cross>
 

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