I had forgoten to add the arch files, here is a fixed patch to be used
instead.
Samuel
Index: build/entities/common.ent
===================================================================
--- build/entities/common.ent (révision 64519)
+++ build/entities/common.ent (copie de travail)
@@ -3,7 +3,7 @@
<!-- The *first* definition of an ENTITY wins. -->
<!-- proper (long) name to use for Debian -->
-<!ENTITY debian "Debian GNU/Linux">
+<!ENTITY debian "Debian GNU/&arch-kernel;">
<!ENTITY d-i "<classname>debian-installer</classname>">
@@ -17,7 +17,7 @@
<!-- proper nouns for architectures -->
<!ENTITY arch-title
- "<phrase arch='amd64'>AMD64</phrase><phrase arch='arm'>ARM</phrase><phrase
arch='hppa'>PA-RISC</phrase><phrase arch='i386'>Intel x86</phrase><phrase
arch='ia64'>IA-64</phrase><phrase arch='mips'>Mips</phrase><phrase
arch='mipsel'>Mipsel</phrase><phrase arch='powerpc'>PowerPC</phrase><phrase
arch='sparc'>SPARC</phrase><phrase arch='s390'>S/390</phrase>">
+ "<phrase arch='any-amd64'>AMD64</phrase><phrase
arch='arm'>ARM</phrase><phrase arch='hppa'>PA-RISC</phrase><phrase
arch='any-i386'>Intel x86</phrase><phrase arch='ia64'>IA-64</phrase><phrase
arch='mips'>Mips</phrase><phrase arch='mipsel'>Mipsel</phrase><phrase
arch='powerpc'>PowerPC</phrase><phrase arch='sparc'>SPARC</phrase><phrase
arch='s390'>S/390</phrase>">
<!ENTITY kernelversion "2.6.32">
Index: build/arch-options/powerpc
===================================================================
--- build/arch-options/powerpc (révision 62894)
+++ build/arch-options/powerpc (copie de travail)
@@ -2,8 +2,9 @@
# the 'powerpc' architecture
# It is sourced by the build scripts
-archspec="powerpc;not-s390;not-x86"
+archspec="powerpc;not-s390;not-x86;linux-any"
arch_listname="powerpc"
+arch_kernel="Linux"
minimum_memory=32
minimum_memory_gtk=128
# These two options should be set if condition 'smp' is set below
Index: build/arch-options/armel
===================================================================
--- build/arch-options/armel (révision 62894)
+++ build/arch-options/armel (copie de travail)
@@ -6,8 +6,9 @@
# 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"
+archspec="arm;not-x86;not-s390;not-powerpc;linux-any"
arch_listname="arm"
+arch_kernel="Linux"
minimum_memory=32
# These two options should be set if condition 'smp' is set below
smp_config_section="N/A"
Index: build/arch-options/ia64
===================================================================
--- build/arch-options/ia64 (révision 62894)
+++ build/arch-options/ia64 (copie de travail)
@@ -2,8 +2,9 @@
# the 'ia64' architecture
# It is sourced by the build scripts
-archspec="ia64;not-x86;not-s390;not-powerpc"
+archspec="ia64;not-x86;not-s390;not-powerpc;linux-any"
arch_listname="ia64"
+arch_kernel="Linux"
minimum_memory=32
# These two options should be set if condition 'smp' is set below
smp_config_section="General setup"
Index: build/arch-options/hppa
===================================================================
--- build/arch-options/hppa (révision 62894)
+++ build/arch-options/hppa (copie de travail)
@@ -2,8 +2,9 @@
# the 'hppa' architecture
# It is sourced by the build scripts
-archspec="hppa;not-x86;not-s390;not-powerpc"
+archspec="hppa;not-x86;not-s390;not-powerpc;linux-any"
arch_listname="hppa"
+arch_kernel="Linux"
minimum_memory=32
# These two options should be set if condition 'smp' is set below
smp_config_section="Processor type and features"
Index: build/arch-options/mips
===================================================================
--- build/arch-options/mips (révision 62894)
+++ build/arch-options/mips (copie de travail)
@@ -2,8 +2,9 @@
# the 'mips' architecture
# It is sourced by the build scripts
-archspec="mips;not-x86;not-s390;not-powerpc"
+archspec="mips;not-x86;not-s390;not-powerpc;linux-any"
arch_listname="mips"
+arch_kernel="Linux"
minimum_memory=32
# These two options should be set if condition 'smp' is set below
smp_config_section="N/A"
Index: build/arch-options/sparc
===================================================================
--- build/arch-options/sparc (révision 62894)
+++ build/arch-options/sparc (copie de travail)
@@ -2,8 +2,9 @@
# the 'sparc' architecture
# It is sourced by the build scripts
-archspec="sparc;not-x86;not-s390;not-powerpc"
+archspec="sparc;not-x86;not-s390;not-powerpc;linux-any"
arch_listname="sparc"
+arch_kernel="Linux"
minimum_memory=32
# These two options should be set if condition 'smp' is set below
smp_config_section="General setup"
Index: build/arch-options/i386
===================================================================
--- build/arch-options/i386 (révision 62894)
+++ build/arch-options/i386 (copie de travail)
@@ -2,8 +2,9 @@
# the 'i386' architecture
# It is sourced by the build scripts
-archspec="i386;x86;not-s390;not-powerpc"
+archspec="i386;any-i386;x86;any-x86;not-s390;not-powerpc;linux-any"
arch_listname="boot"
+arch_kernel="Linux"
minimum_memory=44
minimum_memory_gtk=96
# These two options should be set if condition 'smp' is set below
Index: build/arch-options/mipsel
===================================================================
--- build/arch-options/mipsel (révision 62894)
+++ build/arch-options/mipsel (copie de travail)
@@ -2,8 +2,9 @@
# the 'mipsel' architecture
# It is sourced by the build scripts
-archspec="mipsel;not-x86;not-s390;not-powerpc"
+archspec="mipsel;not-x86;not-s390;not-powerpc;linux-any"
arch_listname="mips"
+arch_kernel="Linux"
minimum_memory=32
# These two options should be set if condition 'smp' is set below
smp_config_section="N/A"
Index: build/arch-options/hurd-i386
===================================================================
--- build/arch-options/hurd-i386 (révision 0)
+++ build/arch-options/hurd-i386 (révision 0)
@@ -0,0 +1,26 @@
+# This file contains architecture specific variables for
+# the 'i386' architecture
+# It is sourced by the build scripts
+
+archspec="hurd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc;hurd-any"
+arch_listname="hurd"
+arch_kernel="Hurd"
+# TODO: update
+minimum_memory=44
+minimum_memory_gtk=96
+# 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=""
+# For Lenny i386 does not have floppy images
+#boot="supports-floppy-boot;bootable-disk"
+boot="bootable-disk"
+frontend="newt"
+other=""
+smp=""
+goodies="supports-lang-chooser"
+status="new-arch;not-checked"
Index: build/arch-options/amd64
===================================================================
--- build/arch-options/amd64 (révision 62894)
+++ build/arch-options/amd64 (copie de travail)
@@ -2,8 +2,9 @@
# the 'amd64' architecture
# It is sourced by the build scripts
-archspec="amd64;x86;not-s390;not-powerpc"
+archspec="amd64;any-amd64;x86;any-x86;not-s390;not-powerpc;linux-any"
arch_listname="amd64"
+arch_kernel="Linux"
minimum_memory=56
minimum_memory_gtk=96
# These two options should be set if condition 'smp' is set below
Index: build/arch-options/kfreebsd-i386
===================================================================
--- build/arch-options/kfreebsd-i386 (révision 0)
+++ build/arch-options/kfreebsd-i386 (révision 0)
@@ -0,0 +1,28 @@
+# This file contains architecture specific variables for
+# the 'kfreebsd-i386' architecture
+# It is sourced by the build scripts
+
+archspec="kfreebsd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc;kfreebsd-any"
+arch_listname="bsd"
+arch_kernel="kFreeBSD"
+# TODO: update
+minimum_memory=44
+minimum_memory_gtk=96
+# These two options should be set if condition 'smp' is set below
+# TODO: update
+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
+# TODO: update
+fdisk="fdisk.txt;cfdisk.txt"
+network="supports-tftp;supports-bootp;supports-nfsroot"
+# For Lenny i386 does not have floppy images
+#boot="supports-floppy-boot;bootable-disk;bootable-usb"
+boot="bootable-disk;bootable-usb"
+frontend="newt;gtk"
+other="supports-wireless;supports-pcmcia;supports-serial-console"
+smp="smp-alternatives"
+goodies="supports-lang-chooser"
+status="new-arch;not-checked"
Index: build/arch-options/s390
===================================================================
--- build/arch-options/s390 (révision 62894)
+++ build/arch-options/s390 (copie de travail)
@@ -2,8 +2,9 @@
# the 's390' architecture
# It is sourced by the build scripts
-archspec="s390;not-powerpc;not-x86"
+archspec="s390;not-powerpc;not-x86;linux-any"
arch_listname="s390"
+arch_kernel="Linux"
minimum_memory=20
# These two options should be set if condition 'smp' is set below
smp_config_section="Processor type and features"
Index: build/arch-options/kfreebsd-amd64
===================================================================
--- build/arch-options/kfreebsd-amd64 (révision 0)
+++ build/arch-options/kfreebsd-amd64 (révision 0)
@@ -0,0 +1,26 @@
+# This file contains architecture specific variables for
+# the 'kfreebsd-amd64' architecture
+# It is sourced by the build scripts
+
+archspec="kfreebsd-amd64;any-amd64;any-x86;not-x86;not-s390;not-powerpc;kfreebsd-any"
+arch_listname="bsd"
+arch_kernel="kFreeBSD"
+# TODO: update
+minimum_memory=56
+minimum_memory_gtk=96
+# These two options should be set if condition 'smp' is set below
+# TODO: update
+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
+# TODO: update
+fdisk="fdisk.txt;cfdisk.txt"
+network="supports-tftp;supports-bootp;supports-nfsroot"
+boot="bootable-disk;bootable-usb"
+frontend="newt;gtk"
+other="supports-wireless;supports-pcmcia;supports-serial-console"
+smp="smp-alternatives"
+goodies="supports-lang-chooser"
+status="new-arch;not-checked"
Index: build/buildone.sh
===================================================================
--- build/buildone.sh (révision 60852)
+++ build/buildone.sh (copie de travail)
@@ -81,6 +81,7 @@
echo "<!-- arch- and lang-specific non-profilable entities -->" > $dynamic
echo "<!ENTITY langext \".${language}\">" >> $dynamic
echo "<!ENTITY architecture \"${arch}\">" >> $dynamic
+ echo "<!ENTITY arch-kernel \"${arch_kernel}\">" >> $dynamic
echo "<!ENTITY arch-listname \"${arch_listname}\">" >> $dynamic
echo "<!ENTITY altkernelversion \"${altkernelversion}\">" >> $dynamic
echo "<!ENTITY smp-config-section \"${smp_config_section}\">" >> $dynamic
Index: build/templates/docstruct.ent
===================================================================
--- build/templates/docstruct.ent (révision 62894)
+++ build/templates/docstruct.ent (copie de travail)
@@ -4,27 +4,31 @@
<!ENTITY preface.xml SYSTEM "##SRCPATH##/preface.xml">
<!ENTITY welcome.xml SYSTEM "##SRCPATH##/welcome/welcome.xml">
- <!ENTITY what-is-debian.xml SYSTEM
"##SRCPATH##/welcome/what-is-debian.xml">
- <!ENTITY what-is-linux.xml SYSTEM
"##SRCPATH##/welcome/what-is-linux.xml">
- <!ENTITY what-is-debian-linux.xml SYSTEM
"##SRCPATH##/welcome/what-is-debian-linux.xml">
- <!ENTITY what-is-debian-hurd.xml SYSTEM
"##SRCPATH##/welcome/what-is-debian-hurd.xml">
- <!ENTITY getting-newest-inst.xml SYSTEM
"##SRCPATH##/welcome/getting-newest-inst.xml">
- <!ENTITY getting-newest-doc.xml SYSTEM
"##SRCPATH##/welcome/getting-newest-doc.xml">
- <!ENTITY doc-organization.xml SYSTEM
"##SRCPATH##/welcome/doc-organization.xml">
- <!ENTITY about-copyright.xml SYSTEM
"##SRCPATH##/welcome/about-copyright.xml">
+ <!ENTITY what-is-debian.xml SYSTEM
"##SRCPATH##/welcome/what-is-debian.xml">
+ <!ENTITY what-is-linux.xml SYSTEM
"##SRCPATH##/welcome/what-is-linux.xml">
+ <!ENTITY what-is-debian-linux.xml SYSTEM
"##SRCPATH##/welcome/what-is-debian-linux.xml">
+ <!ENTITY what-is-debian-kfreebsd.xml SYSTEM
"##SRCPATH##/welcome/what-is-debian-kfreebsd.xml">
+ <!ENTITY what-is-debian-hurd.xml SYSTEM
"##SRCPATH##/welcome/what-is-debian-hurd.xml">
+ <!ENTITY getting-newest-inst.xml SYSTEM
"##SRCPATH##/welcome/getting-newest-inst.xml">
+ <!ENTITY getting-newest-doc.xml SYSTEM
"##SRCPATH##/welcome/getting-newest-doc.xml">
+ <!ENTITY doc-organization.xml SYSTEM
"##SRCPATH##/welcome/doc-organization.xml">
+ <!ENTITY about-copyright.xml SYSTEM
"##SRCPATH##/welcome/about-copyright.xml">
<!ENTITY hardware.xml SYSTEM "##SRCPATH##/hardware/hardware.xml">
<!ENTITY hardware-supported.xml SYSTEM
"##SRCPATH##/hardware/hardware-supported.xml">
- <!ENTITY supported-amd64.xml SYSTEM
"##SRCPATH##/hardware/supported/amd64.xml">
- <!ENTITY supported-arm.xml SYSTEM
"##SRCPATH##/hardware/supported/arm.xml">
- <!ENTITY supported-hppa.xml SYSTEM
"##SRCPATH##/hardware/supported/hppa.xml">
- <!ENTITY supported-i386.xml SYSTEM
"##SRCPATH##/hardware/supported/i386.xml">
- <!ENTITY supported-ia64.xml SYSTEM
"##SRCPATH##/hardware/supported/ia64.xml">
- <!ENTITY supported-mips.xml SYSTEM
"##SRCPATH##/hardware/supported/mips.xml">
- <!ENTITY supported-mipsel.xml SYSTEM
"##SRCPATH##/hardware/supported/mipsel.xml">
- <!ENTITY supported-powerpc.xml SYSTEM
"##SRCPATH##/hardware/supported/powerpc.xml">
- <!ENTITY supported-s390.xml SYSTEM
"##SRCPATH##/hardware/supported/s390.xml">
- <!ENTITY supported-sparc.xml SYSTEM
"##SRCPATH##/hardware/supported/sparc.xml">
+ <!ENTITY supported-amd64.xml SYSTEM
"##SRCPATH##/hardware/supported/amd64.xml">
+ <!ENTITY supported-arm.xml SYSTEM
"##SRCPATH##/hardware/supported/arm.xml">
+ <!ENTITY supported-hppa.xml SYSTEM
"##SRCPATH##/hardware/supported/hppa.xml">
+ <!ENTITY supported-i386.xml SYSTEM
"##SRCPATH##/hardware/supported/i386.xml">
+ <!ENTITY supported-hurd-i386.xml SYSTEM
"##SRCPATH##/hardware/supported/hurd-i386.xml">
+ <!ENTITY supported-kfreebsd-i386.xml SYSTEM
"##SRCPATH##/hardware/supported/kfreebsd-i386.xml">
+ <!ENTITY supported-kfreebsd-amd64.xml SYSTEM
"##SRCPATH##/hardware/supported/kfreebsd-amd64.xml">
+ <!ENTITY supported-ia64.xml SYSTEM
"##SRCPATH##/hardware/supported/ia64.xml">
+ <!ENTITY supported-mips.xml SYSTEM
"##SRCPATH##/hardware/supported/mips.xml">
+ <!ENTITY supported-mipsel.xml SYSTEM
"##SRCPATH##/hardware/supported/mipsel.xml">
+ <!ENTITY supported-powerpc.xml SYSTEM
"##SRCPATH##/hardware/supported/powerpc.xml">
+ <!ENTITY supported-s390.xml SYSTEM
"##SRCPATH##/hardware/supported/s390.xml">
+ <!ENTITY supported-sparc.xml SYSTEM
"##SRCPATH##/hardware/supported/sparc.xml">
<!ENTITY network-cards.xml SYSTEM
"##SRCPATH##/hardware/network-cards.xml">
<!ENTITY supported-peripherals.xml SYSTEM
"##SRCPATH##/hardware/supported-peripherals.xml">
<!ENTITY accessibility-hardware.xml SYSTEM
"##SRCPATH##/hardware/accessibility.xml">
Index: en/preface.xml
===================================================================
--- en/preface.xml (révision 64518)
+++ en/preface.xml (copie de travail)
@@ -6,7 +6,7 @@
<para>
We are delighted that you have decided to try Debian, and are
-sure that you will find that Debian's GNU/Linux distribution is
+sure that you will find that Debian's GNU/&arch-kernel; distribution is
unique. &debian; brings together high-quality free software
from around the world, integrating it into a coherent whole. We
believe that you will find that the result is truly more than the sum
Index: en/partitioning/sizing.xml
===================================================================
--- en/partitioning/sizing.xml (révision 64518)
+++ en/partitioning/sizing.xml (copie de travail)
@@ -6,7 +6,7 @@
<title>Deciding on Debian Partitions and Sizes</title>
<para>
-At a bare minimum, GNU/Linux needs one partition for itself. You can
+At a bare minimum, GNU/&arch-kernel; needs one partition for itself. You can
have a single partition containing the entire operating system,
applications, and your personal files. Most people feel that a
separate swap partition is also a necessity, although it's not
@@ -18,7 +18,7 @@
</para><para>
-Most people choose to give GNU/Linux more than the minimum number of
+Most people choose to give GNU/&arch-kernel; more than the minimum number of
partitions, however. There are two reasons you might want to break up
the file system into a number of smaller partitions. The first is for
safety. If something happens to corrupt the file system, generally
@@ -27,7 +27,7 @@
system. At a bare minimum, you should consider creating what is
commonly called a <quote>root partition</quote>. This contains the most
essential
components of the system. If any other partitions get corrupted, you
-can still boot into GNU/Linux to fix the system. This can save you the
+can still boot into GNU/&arch-kernel; to fix the system. This can save you the
trouble of having to reinstall the system from scratch.
</para><para>
Index: en/welcome/what-is-debian-linux.xml
===================================================================
--- en/welcome/what-is-debian-linux.xml (révision 64518)
+++ en/welcome/what-is-debian-linux.xml (copie de travail)
@@ -2,7 +2,7 @@
<!-- $Id$ -->
<sect1 id="what-is-debian-linux">
- <title>What is &debian;?</title>
+ <title>What is Debian GNU/Linux?</title>
<para>
The combination of Debian's philosophy and methodology and the GNU
Index: en/welcome/welcome.xml
===================================================================
--- en/welcome/welcome.xml (révision 64518)
+++ en/welcome/welcome.xml (copie de travail)
@@ -15,6 +15,7 @@
&what-is-linux.xml;
&what-is-debian-linux.xml;
&what-is-debian-hurd.xml;
+&what-is-debian-kfreebsd.xml;
&getting-newest-inst.xml;
&getting-newest-doc.xml;
&doc-organization.xml;
Index: en/welcome/what-is-debian-kfreebsd.xml
===================================================================
--- en/welcome/what-is-debian-kfreebsd.xml (révision 64518)
+++ en/welcome/what-is-debian-kfreebsd.xml (copie de travail)
@@ -1,27 +1,22 @@
<!-- retain these comments for translator revision tracking -->
<!-- $Id$ -->
-<!-- conditionalised because the hurd port is not yet an official debian
-release -->
- <sect1 id="what-is-debian-hurd" condition="unofficial-build">
- <title>What is Debian GNU/Hurd?</title>
+ <sect1 id="what-is-debian-kfreebsd">
+ <title>What is Debian GNU/kFreeBSD?</title>
<para>
-Debian GNU/Hurd is a Debian GNU system that replaces the Linux
-monolithic kernel with the GNU Hurd — a set of servers running on
-top of the GNU Mach microkernel. The Hurd is still unfinished, and is
-unsuitable for day-to-day use, but work is continuing. The Hurd is
-currently only being developed for the i386 architecture, although
-ports to other architectures will be made once the system becomes more
-stable.
+Debian GNU/kFreeBSD is a Debian GNU system that replaces the Linux
+kernel with the kFreeBSD kernel. This port of Debian is currently
+only being developed for the i386 and amd64 architectures, although
+ports to other architectures is possible.
</para><para>
For more information, see the
-<ulink url="http://www.debian.org/ports/hurd/";>
-Debian GNU/Hurd ports page</ulink>
-and the <email>debian-h...@lists.debian.org</email>
+<ulink url="http://www.debian.org/ports/kfreebsd-gnu/";>
+Debian GNU/kFreeBSD ports page</ulink>
+and the <email>debian-...@lists.debian.org</email>
mailing list.
</para>
Index: en/hardware/hardware-supported.xml
===================================================================
--- en/hardware/hardware-supported.xml (révision 64518)
+++ en/hardware/hardware-supported.xml (copie de travail)
@@ -26,7 +26,7 @@
<sect2><title>Supported Architectures</title>
<para>
-Debian &release; supports eleven major architectures and several
+Debian GNU/Linux &release; supports eleven major architectures and several
variations of each architecture known as <quote>flavors</quote>.
</para><para>
@@ -153,8 +153,36 @@
</para><para>
-This document covers installation for the
-<emphasis>&arch-title;</emphasis> architecture. If you are looking
+Debian GNU/kFreeBSD &release; supports two architectures.
+
+</para><para>
+
+<informaltable>
+<tgroup cols="2">
+<thead>
+<row>
+ <entry>Architecture</entry><entry>Debian Designation</entry>
+</row>
+</thead>
+
+<tbody>
+<row>
+ <entry>Intel x86-based</entry>
+ <entry>kfreebsd-i386</entry>
+</row>
+
+<row>
+ <entry>AMD64 & Intel EM64T</entry>
+ <entry>kfreebsd-amd64</entry>
+</row>
+
+</tbody></tgroup></informaltable>
+
+</para><para>
+
+This document covers installation for the <emphasis>&arch-title;</emphasis>
+architecture using the <emphasis>&arch-kernel;</emphasis> kernel.
+If you are looking
for information on any of the other Debian-supported architectures
take a look at the
<ulink url="http://www.debian.org/ports/";>Debian-Ports</ulink> pages.
@@ -179,7 +207,8 @@
encounter a few bugs. Use our
<ulink url="&url-bts;">Bug Tracking System</ulink> to report any
problems; make sure to mention the fact that the bug is on the
-&arch-title; platform. It can be necessary to use the
+&arch-title; platform using the <emphasis>&arch-kernel;</emphasis> kernel.
+It can be necessary to use the
<ulink url="&url-list-subscribe;">debian-&arch-listname; mailing list</ulink>
as well.
Index: en/boot-installer/accessibility.xml
===================================================================
--- en/boot-installer/accessibility.xml (révision 64518)
+++ en/boot-installer/accessibility.xml (copie de travail)
@@ -83,7 +83,7 @@
</para>
</sect2>
- <sect2><title>Board Devices</title>
+ <sect2 arch="linux-any"><title>Board Devices</title>
<para>
Some accessibility devices are actual boards that are plugged inside the
