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

svn path=/dists/trunk/linux/; revision=22507

debian/changelog

@@ -2,6 +2,10 @@ linux (4.0-1~exp1) UNRELEASED; urgency=medium
 
   * 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@debian.org>  Sun, 29 Mar 2015 23:31:57 +0200
 
 linux (3.19.3-1~exp1) experimental; urgency=medium

debian/config/i386/defines

@@ -44,13 +44,3 @@ configs:
  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

debian/config/i386/none/defines

@@ -2,10 +2,6 @@
 flavours:
  586
  686-pae
- amd64
 
 [686-pae_description]
 parts: xen
-
-[amd64_description]
-parts: xen

debian/config/s390/defines

@@ -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