From a2a80612e7945bed0debdd49e2529110b1070c89 Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurel32@debian.org>
Date: Thu, 28 Jul 2011 09:37:10 +0000
Subject: [PATCH]   * Add configuration files for s390x architecture.

svn path=/dists/trunk/linux-2.6/; revision=17861
---
 debian/changelog                 |  7 +++++++
 debian/config/defines            |  1 +
 debian/config/s390x/defines      | 35 ++++++++++++++++++++++++++++++++
 debian/templates/control.main.in |  2 +-
 4 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 debian/config/s390x/defines

diff --git a/debian/changelog b/debian/changelog
index 173f7011b..7f5a68cef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@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
diff --git a/debian/config/defines b/debian/config/defines
index 32b08d442..b2f4d296d 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -16,6 +16,7 @@ arches:
  powerpc
  ppc64
  s390
+ s390x
  sh4
  sparc
  sparc64
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
new file mode 100644
index 000000000..7ce0db2e0
--- /dev/null
+++ b/debian/config/s390x/defines
@@ -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
+
diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in
index 2c323e86c..b082defdc 100644
--- a/debian/templates/control.main.in
+++ b/debian/templates/control.main.in
@@ -1,5 +1,5 @@
 Package: linux-tools-@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-@version@