[kernel] r19534 - in dists/trunk/linux/debian: . config/s390 config/s390x installer/s390 installer/s390/modules/s390x-tape installer/s390x installer/s390x/modules/s390x-tape

[Bastian Blank]

Author: waldi
Date: Sun Nov 25 13:58:27 2012
New Revision: 19534

Log:
* debian/changelog: Update.
* debian/config/s390/config.s390, debian/config/s390/config.s390x:
  Remove not longer supported IPL options.
* debian/config/s390/config.s390-tape, debian/config/s390/config.s390x-tape:
  Remove.
* debian/config/s390/defines, debian/config/s390x/defines:
  Remove s390x-tape image.
* debian/installer/s390/kernel-versions,
  debian/installer/s390/modules/s390x-tape,
  debian/installer/s390x/kernel-versions,
  debian/installer/s390x/modules/s390x-tape:
  Remove s390x-tape definitions.

Deleted:
   dists/trunk/linux/debian/config/s390/config.s390-tape
   dists/trunk/linux/debian/config/s390/config.s390x-tape
   dists/trunk/linux/debian/installer/s390/modules/s390x-tape/
   dists/trunk/linux/debian/installer/s390x/modules/s390x-tape/
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/s390/config.s390
   dists/trunk/linux/debian/config/s390/config.s390x
   dists/trunk/linux/debian/config/s390/defines
   dists/trunk/linux/debian/config/s390x/defines
   dists/trunk/linux/debian/installer/s390/kernel-versions
   dists/trunk/linux/debian/installer/s390x/kernel-versions

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun Nov 25 13:52:33 2012	(r19533)
+++ dists/trunk/linux/debian/changelog	Sun Nov 25 13:58:27 2012	(r19534)
@@ -7,7 +7,9 @@
   * Enable POWER_SUPPLY, BLK_DEV_THROTTLING and NETPRIO_CGROUP.
   * [amd64] Enable CRYPTO_CAMELLIA_X86_64, CRYPTO_SERPENT_AVX_X86_64 and
     CRYPTO_TWOFISH_AVX_X86_64.
-  * [x86]: Enable more platform drivers.
+  * [x86] Enable more platform drivers.
+  * [s390/s390x-tape, s390x/s390x-tape] Remove not longer supported image
+    variant.
 
  -- Bastian Blank <waldi at debian.org>  Wed, 21 Nov 2012 09:34:28 +0100
 

Modified: dists/trunk/linux/debian/config/s390/config.s390
==============================================================================
--- dists/trunk/linux/debian/config/s390/config.s390	Sun Nov 25 13:52:33 2012	(r19533)
+++ dists/trunk/linux/debian/config/s390/config.s390	Sun Nov 25 13:58:27 2012	(r19534)
@@ -8,10 +8,6 @@
 # CONFIG_MARCH_Z990 is not set
 # CONFIG_MARCH_Z9_109 is not set
 ## end choice
-## choice: IPL method generated into head.S
-# CONFIG_IPL_TAPE is not set
-CONFIG_IPL_VM=y
-## end choice
 
 ##
 ## file: fs/btrfs/Kconfig

Modified: dists/trunk/linux/debian/config/s390/config.s390x
==============================================================================
--- dists/trunk/linux/debian/config/s390/config.s390x	Sun Nov 25 13:52:33 2012	(r19533)
+++ dists/trunk/linux/debian/config/s390/config.s390x	Sun Nov 25 13:58:27 2012	(r19534)
@@ -10,9 +10,3 @@
 # CONFIG_MARCH_Z10 is not set
 ## end choice
 
-##
-## file: unknown
-##
-# CONFIG_IPL_TAPE is not set
-CONFIG_IPL_VM=y
-

Modified: dists/trunk/linux/debian/config/s390/defines
==============================================================================
--- dists/trunk/linux/debian/config/s390/defines	Sun Nov 25 13:52:33 2012	(r19533)
+++ dists/trunk/linux/debian/config/s390/defines	Sun Nov 25 13:58:27 2012	(r19534)
@@ -1,49 +1,17 @@
 [base]
 flavours:
  s390x
- s390x-tape
 kernel-arch: s390
 
-[description]
-part-long-reader: This kernel has support to IPL (boot) from a VM reader or DASD device.
-part-long-tape: This kernel has support to IPL (boot) from a tape.
-part-short-tape: IPL from tape
-
 [image]
 bootloaders: s390-tools
 
 [s390_description]
 hardware: IBM S/390
-parts: reader
-
-[s390-tape_build]
-modules: false
-
-[s390-tape_description]
-hardware: IBM S/390
-parts: tape
-
-[s390-tape_image]
-initramfs: false
-override-localversion: s390
-type: plain-s390-tape
 
 [s390x_build]
 debug-info: true
 
 [s390x_description]
 hardware: IBM zSeries
-parts: reader
-
-[s390x-tape_build]
-modules: false
-
-[s390x-tape_description]
-hardware: IBM zSeries
-parts: tape
-
-[s390x-tape_image]
-initramfs: false
-override-localversion: s390x
-type: plain-s390-tape
 

Modified: dists/trunk/linux/debian/config/s390x/defines
==============================================================================
--- dists/trunk/linux/debian/config/s390x/defines	Sun Nov 25 13:52:33 2012	(r19533)
+++ dists/trunk/linux/debian/config/s390x/defines	Sun Nov 25 13:58:27 2012	(r19534)
@@ -1,14 +1,8 @@
 [base]
 flavours:
  s390x
- s390x-tape
 kernel-arch: s390
 
-[description]
-part-long-reader: This kernel has support to IPL (boot) from a VM reader or DASD device.
-part-long-tape: This kernel has support to IPL (boot) from a tape.
-part-short-tape: IPL from tape
-
 [image]
 bootloaders: s390-tools
 configs: s390/config
@@ -18,21 +12,7 @@
 
 [s390x_description]
 hardware: IBM zSeries
-parts: reader
 
 [s390x_image]
 configs: s390/config.s390x
 
-[s390x-tape_build]
-modules: false
-
-[s390x-tape_description]
-hardware: IBM zSeries
-parts: tape
-
-[s390x-tape_image]
-configs: s390/config.s390x-tape
-initramfs: false
-override-localversion: s390x
-type: plain-s390-tape
-

Modified: dists/trunk/linux/debian/installer/s390/kernel-versions
==============================================================================
--- dists/trunk/linux/debian/installer/s390/kernel-versions	Sun Nov 25 13:52:33 2012	(r19533)
+++ dists/trunk/linux/debian/installer/s390/kernel-versions	Sun Nov 25 13:58:27 2012	(r19534)
@@ -1,3 +1,2 @@
 # arch version flavour    installedname suffix build-depends
 s390   -       s390x      -             -      -
-s390   -       s390x-tape -             -tape  -

Modified: dists/trunk/linux/debian/installer/s390x/kernel-versions
==============================================================================
--- dists/trunk/linux/debian/installer/s390x/kernel-versions	Sun Nov 25 13:52:33 2012	(r19533)
+++ dists/trunk/linux/debian/installer/s390x/kernel-versions	Sun Nov 25 13:58:27 2012	(r19534)
@@ -1,3 +1,2 @@
 # arch version flavour    installedname suffix build-depends
 s390x  -       s390x      -             -      -
-s390x  -       s390x-tape -             -tape  -