Add armhf, s390x architectures, comment hppa architecture

7 files changed, 98 insertions, 10 deletions

diff --git a/build/arch-options/armhf b/build/arch-options/armhf
new file mode 100644
index 000000000..b202d4122
--- /dev/null
+++ b/build/arch-options/armhf
@@ -0,0 +1,26 @@
+# This file contains architecture specific variables for
+# the 'armhf' architecture
+# It is sourced by the build scripts
+
+# Note that we keep "arm" as archspec (and thus also for conditions)
+# and also continue to use "arm" for arch-specific XML-files in order
+# to minimize impact on translations.
+
+archspec="arm;not-x86;not-s390;not-powerpc"
+arch_listname="arm"
+arch_porturl="arm"
+minimum_memory=36
+# These two options should be set if condition 'smp' is set below
+smp_config_section="N/A"
+smp_config_option="N/A"
+
+# Options below are assembled into one variable 'condition'
+# in the build scripts
+fdisk="fdisk.txt;cfdisk.txt"
+network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot"
+boot=""
+frontend="newt;not-gtk"
+other="supports-serial-console"
+smp=""
+goodies="supports-lang-chooser"
+status="not-checked"
diff --git a/build/arch-options/s390x b/build/arch-options/s390x
new file mode 100644
index 000000000..350dff8b0
--- /dev/null
+++ b/build/arch-options/s390x
@@ -0,0 +1,26 @@
+# This file contains architecture specific variables for
+# the 's390x' architecture
+# It is sourced by the build scripts
+
+# Note that we keep "s390" as archspec (and thus also for conditions)
+# and also continue to use "s390" for arch-specific XML-files in order
+# to minimize impact on translations.
+
+archspec="s390;not-powerpc;not-x86"
+arch_listname="s390"
+arch_porturl="s390"
+minimum_memory=20
+# These two options should be set if condition 'smp' is set below
+smp_config_section="Processor type and features"
+smp_config_option="Symmetric multi-processing support"
+
+# Options below are assembled into one variable 'condition'
+# in the build scripts
+fdisk="fdasd.txt;dasdfmt.txt"
+network=""
+boot=""
+frontend="not-newt;not-gtk"
+other=""
+smp="defaults-smp"
+goodies=""
+status="not-checked"
diff --git a/debian/archlist b/debian/archlist
index 2bcf888b4..a3764f8fe 100644
--- a/debian/archlist
+++ b/debian/archlist
@@ -6,12 +6,14 @@
 i386	Intel x86
 amd64	AMD64
 armel	ARM
-hppa	PA-RISC (hppa)
+armhf	ARM
+#hppa	PA-RISC (hppa)
 ia64	IA-64
 mips	Mips
 mipsel	Mipsel
 powerpc	PowerPC
 s390	S/390
+s390x	S/390
 sparc	Sparc
 kfreebsd-i386	kFreeBSD Intel x86
 kfreebsd-amd64	kFreeBSD AMD64
diff --git a/debian/changelog b/debian/changelog
index 8e44f629b..e34334b8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ installation-guide (2011xxxx) UNRELEASED; urgency=low
     default, and document how to enable it. Thanks Filipus Klutiero for the
     report. Closes: #666105.
   * Document that installing an MBR is needed to get a bootable USB key.
+  * Add armhf, s390x architectures, comment hppa architecture.
 
   [ Steve McIntyre ]
   * Make it clearer how we expect users to write CDs to USB sticks.
diff --git a/debian/control b/debian/control
index dc33173c9..f9255267f 100644
--- a/debian/control
+++ b/debian/control
@@ -70,15 +70,24 @@ Description: Debian installation guide for armel
  .
  A shorter reference, the installation HOWTO, is included in an appendix.
 
-Package: installation-guide-hppa
+Package: installation-guide-armhf
 Architecture: all
 Conflicts: installation-guide
-Description: Debian installation guide for hppa
- This package contains the Debian installation guide for the PA-RISC
- architecture, in a variety of languages.
+Description: Debian installation guide for armhf
+ This package contains the Debian installation guide for the ARM
+ with Hardware FPU architecture, in a variety of languages.
  .
  A shorter reference, the installation HOWTO, is included in an appendix.
 
+#Package: installation-guide-hppa
+#Architecture: all
+#Conflicts: installation-guide
+#Description: Debian installation guide for hppa
+# This package contains the Debian installation guide for the PA-RISC
+# architecture, in a variety of languages.
+# .
+# A shorter reference, the installation HOWTO, is included in an appendix.
+
 Package: installation-guide-i386
 Architecture: all
 Conflicts: installation-guide
@@ -151,6 +160,15 @@ Description: Debian installation guide for s390
  .
  A shorter reference, the installation HOWTO, is included in an appendix.
 
+Package: installation-guide-s390x
+Architecture: all
+Conflicts: installation-guide
+Description: Debian installation guide for s390x
+ This package contains the Debian installation guide for the 64bit S/390
+ architecture, in a variety of languages.
+ .
+ A shorter reference, the installation HOWTO, is included in an appendix.
+
 Package: installation-guide-sparc
 Architecture: all
 Conflicts: installation-guide
diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml
index 3a63fcf00..5e05dd577 100644
--- a/en/appendix/chroot-install.xml
+++ b/en/appendix/chroot-install.xml
@@ -174,18 +174,16 @@ of the http URL: <userinput>file:/cdrom/debian/</userinput>
 Substitute one of the following for <replaceable>ARCH</replaceable>
 in the <command>debootstrap</command> command:
 
-<userinput>alpha</userinput>,
 <userinput>amd64</userinput>,
-<userinput>arm</userinput>,
 <userinput>armel</userinput>,
-<userinput>hppa</userinput>,
+<userinput>armhf</userinput>,
 <userinput>i386</userinput>,
 <userinput>ia64</userinput>,
-<userinput>m68k</userinput>,
 <userinput>mips</userinput>,
 <userinput>mipsel</userinput>,
 <userinput>powerpc</userinput>,
-<userinput>s390</userinput>, or
+<userinput>s390</userinput>,
+<userinput>s390x</userinput>, or
 <userinput>sparc</userinput>.
 
 <informalexample><screen>
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index add2137b7..66d69ff64 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -75,6 +75,13 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
+  <entry>ARM with hardware FPU</entry>
+  <entry>armhf</entry>
+  <entry>Freescale</entry>
+  <entry>mx5</entry>
+</row>
+
+<row>
   <entry morerows="1">HP PA-RISC</entry>
   <entry morerows="1">hppa</entry>
   <entry>PA-RISC 1.1</entry>
@@ -149,6 +156,16 @@ variations of each architecture known as <quote>flavors</quote>.
   <entry>tape</entry>
 </row>
 
+<row>
+  <entry morerows="1">64bit IBM S/390</entry>
+  <entry morerows="1">s390x</entry>
+  <entry>IPL from VM-reader and DASD</entry>
+  <entry>generic</entry>
+</row><row>
+  <entry>IPL from tape</entry>
+  <entry>tape</entry>
+</row>
+
 </tbody></tgroup></informaltable>
 
 </para><para>