[kernel] r22507 - in dists/trunk/linux/debian: . config/i386 config/i386/none config/s390

[Ben Hutchings]

Author: benh
Date: Mon Apr 13 17:06:59 2015
New Revision: 22507

Log:
[i386,s390] Remove 64-bit kernel flavours, which are also available through multiarch

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/i386/defines
   dists/trunk/linux/debian/config/i386/none/defines
   dists/trunk/linux/debian/config/s390/defines

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Mon Apr 13 03:12:16 2015	(r22506)
+++ dists/trunk/linux/debian/changelog	Mon Apr 13 17:06:59 2015	(r22507)
@@ -2,6 +2,10 @@
 
   * New upstream release: http://kernelnewbies.org/Linux_4.0
 
+  [ Ben Hutchings ]
+  * [i386,s390] Remove 64-bit kernel flavours, which are also available
+    through multiarch
+
  -- maximilian attems <maks at debian.org>  Sun, 29 Mar 2015 23:31:57 +0200
 
 linux (3.19.3-1~exp1) experimental; urgency=medium

Modified: dists/trunk/linux/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux/debian/config/i386/defines	Mon Apr 13 03:12:16 2015	(r22506)
+++ dists/trunk/linux/debian/config/i386/defines	Mon Apr 13 17:06:59 2015	(r22507)
@@ -44,13 +44,3 @@
  kernelarch-x86/config-arch-32
  i386/config.686-pae
 recommends: libc6-i686
-
-[amd64_description]
-hardware: 64-bit PCs
-hardware-long: PCs with AMD64, Intel 64 or VIA Nano processors
-parts: xen
-
-[amd64_image]
-configs:
- kernelarch-x86/config-arch-64
-recommends: libc6-i686

Modified: dists/trunk/linux/debian/config/i386/none/defines
==============================================================================
--- dists/trunk/linux/debian/config/i386/none/defines	Mon Apr 13 03:12:16 2015	(r22506)
+++ dists/trunk/linux/debian/config/i386/none/defines	Mon Apr 13 17:06:59 2015	(r22507)
@@ -2,10 +2,6 @@
 flavours:
  586
  686-pae
- amd64
 
 [686-pae_description]
 parts: xen
-
-[amd64_description]
-parts: xen

Modified: dists/trunk/linux/debian/config/s390/defines
==============================================================================
--- dists/trunk/linux/debian/config/s390/defines	Mon Apr 13 03:12:16 2015	(r22506)
+++ dists/trunk/linux/debian/config/s390/defines	Mon Apr 13 17:06:59 2015	(r22507)
@@ -1,27 +1,4 @@
 [base]
-flavours:
- s390x
 kernel-arch: s390
-# gcc 4.9 breaks access to virtual address 0
-compiler: gcc-4.8
-
-[build]
-image-file: arch/s390/boot/image
-
-[image]
-bootloaders: s390-tools
-configs:
-install-stem: vmlinuz
-
-[relations]
-headers%gcc-4.8: linux-compiler-gcc-4.8-s390
-
-[s390x_build]
-debug-info: true
-
-[s390x_description]
-hardware: IBM zSeries
-
-[s390x_image]
-configs: kernelarch-s390/config-arch-64
-
+featuresets:
+# empty; s390 must be part of a multiarch installation with an s390x kernel