diff options
| -rw-r--r-- | build/arch-options/amd64 | 3 | ||||
| -rw-r--r-- | build/arch-options/armel | 3 | ||||
| -rw-r--r-- | build/arch-options/hppa | 3 | ||||
| -rw-r--r-- | build/arch-options/hurd-i386 | 26 | ||||
| -rw-r--r-- | build/arch-options/i386 | 3 | ||||
| -rw-r--r-- | build/arch-options/ia64 | 3 | ||||
| -rw-r--r-- | build/arch-options/kfreebsd-amd64 | 26 | ||||
| -rw-r--r-- | build/arch-options/kfreebsd-i386 | 28 | ||||
| -rw-r--r-- | build/arch-options/mips | 3 | ||||
| -rw-r--r-- | build/arch-options/mipsel | 3 | ||||
| -rw-r--r-- | build/arch-options/powerpc | 3 | ||||
| -rw-r--r-- | build/arch-options/s390 | 3 | ||||
| -rw-r--r-- | build/arch-options/sparc | 3 | ||||
| -rwxr-xr-x | build/buildone.sh | 1 | ||||
| -rw-r--r-- | build/entities/common.ent | 4 | ||||
| -rw-r--r-- | build/templates/docstruct.ent | 40 | ||||
| -rw-r--r-- | debian/changelog | 4 |
17 files changed, 128 insertions, 31 deletions
diff --git a/build/arch-options/amd64 b/build/arch-options/amd64 index 9dd329e07..fa8de3806 100644 --- a/build/arch-options/amd64 +++ b/build/arch-options/amd64 @@ -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 diff --git a/build/arch-options/armel b/build/arch-options/armel index f773e95eb..39c7c9fb7 100644 --- a/build/arch-options/armel +++ b/build/arch-options/armel @@ -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" diff --git a/build/arch-options/hppa b/build/arch-options/hppa index a47043190..6c50a6508 100644 --- a/build/arch-options/hppa +++ b/build/arch-options/hppa @@ -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" diff --git a/build/arch-options/hurd-i386 b/build/arch-options/hurd-i386 new file mode 100644 index 000000000..a913acbaf --- /dev/null +++ b/build/arch-options/hurd-i386 @@ -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" diff --git a/build/arch-options/i386 b/build/arch-options/i386 index e19824e8f..741f4a560 100644 --- a/build/arch-options/i386 +++ b/build/arch-options/i386 @@ -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 diff --git a/build/arch-options/ia64 b/build/arch-options/ia64 index 292b9989c..e6483dc11 100644 --- a/build/arch-options/ia64 +++ b/build/arch-options/ia64 @@ -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" diff --git a/build/arch-options/kfreebsd-amd64 b/build/arch-options/kfreebsd-amd64 new file mode 100644 index 000000000..46ab9267c --- /dev/null +++ b/build/arch-options/kfreebsd-amd64 @@ -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" diff --git a/build/arch-options/kfreebsd-i386 b/build/arch-options/kfreebsd-i386 new file mode 100644 index 000000000..67734925c --- /dev/null +++ b/build/arch-options/kfreebsd-i386 @@ -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" diff --git a/build/arch-options/mips b/build/arch-options/mips index 711fb34b3..c7259c65b 100644 --- a/build/arch-options/mips +++ b/build/arch-options/mips @@ -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" diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel index d665055e3..e47979507 100644 --- a/build/arch-options/mipsel +++ b/build/arch-options/mipsel @@ -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" diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc index 85b357604..008775381 100644 --- a/build/arch-options/powerpc +++ b/build/arch-options/powerpc @@ -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 diff --git a/build/arch-options/s390 b/build/arch-options/s390 index 9ca3f7098..b7fa1f4fc 100644 --- a/build/arch-options/s390 +++ b/build/arch-options/s390 @@ -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" diff --git a/build/arch-options/sparc b/build/arch-options/sparc index 665bcb6f9..61255e2e8 100644 --- a/build/arch-options/sparc +++ b/build/arch-options/sparc @@ -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" diff --git a/build/buildone.sh b/build/buildone.sh index 619ea2e36..47b09e4ec 100755 --- a/build/buildone.sh +++ b/build/buildone.sh @@ -81,6 +81,7 @@ create_profiled () { 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 diff --git a/build/entities/common.ent b/build/entities/common.ent index a8b4e83eb..4836e06b5 100644 --- a/build/entities/common.ent +++ b/build/entities/common.ent @@ -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"> diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent index 8e8691414..543bb3f1b 100644 --- a/build/templates/docstruct.ent +++ b/build/templates/docstruct.ent @@ -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"> diff --git a/debian/changelog b/debian/changelog index 261173293..37302bfc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,10 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low [ Samuel Thibault ] * Update brltty version. * Document booting from DOS (Closes: Bug#518808). + * Add non-Linux infrastructure to the build system. + * Add kFreeBSD infrastructure. - -- Samuel Thibault <sthibault@debian.org> Sun, 05 Sep 2010 23:56:10 +0200 + -- Samuel Thibault <sthibault@debian.org> Mon, 06 Sep 2010 00:06:36 +0200 installation-guide (20100518) unstable; urgency=low |