[kernel] r17861 - in dists/trunk/linux-2.6/debian: . config config/s390x templates

[Aurelien Jarno]

Author: aurel32
Date: Thu Jul 28 09:37:10 2011
New Revision: 17861

Log:
* Add configuration files for s390x architecture.

Added:
   dists/trunk/linux-2.6/debian/config/s390x/
   dists/trunk/linux-2.6/debian/config/s390x/defines
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/defines
   dists/trunk/linux-2.6/debian/templates/control.main.in

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Jul 24 14:40:05 2011	(r17860)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Jul 28 09:37:10 2011	(r17861)
@@ -1,3 +1,10 @@
+linux-2.6 (3.0.0-2) unstable; urgency=low
+
+  [ Aurelien Jarno ]
+  * Add configuration files for s390x architecture.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 27 Jul 2011 23:58:10 +0200
+
 linux-2.6 (3.0.0-1) unstable; urgency=low
 
   * New upstream release: http://kernelnewbies.org/Linux_3.0

Modified: dists/trunk/linux-2.6/debian/config/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/defines	Sun Jul 24 14:40:05 2011	(r17860)
+++ dists/trunk/linux-2.6/debian/config/defines	Thu Jul 28 09:37:10 2011	(r17861)
@@ -16,6 +16,7 @@
  powerpc
  ppc64
  s390
+ s390x
  sh4
  sparc
  sparc64

Added: dists/trunk/linux-2.6/debian/config/s390x/defines
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/config/s390x/defines	Thu Jul 28 09:37:10 2011	(r17861)
@@ -0,0 +1,35 @@
+[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
+
+[s390x_description]
+hardware: IBM zSeries
+parts: reader
+
+[s390x_image]
+configs: s390/config.s390x
+
+[s390x-tape_base]
+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-2.6/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.main.in	Sun Jul 24 14:40:05 2011	(r17860)
+++ dists/trunk/linux-2.6/debian/templates/control.main.in	Thu Jul 28 09:37:10 2011	(r17861)
@@ -1,5 +1,5 @@
 Package: linux-tools- at version@
-Architecture: alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 sh4 sparc sparc64
+Architecture: alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
 Recommends: linux-base (>= 2.6.32-16)
 Suggests: linux-doc- at version@