diff options
Diffstat (limited to 'build')
-rw-r--r-- | build/arch-options/amd64 | 2 | ||||
-rw-r--r-- | build/arch-options/armel | 2 | ||||
-rw-r--r-- | build/arch-options/hppa | 2 | ||||
-rw-r--r-- | build/arch-options/i386 | 2 | ||||
-rw-r--r-- | build/arch-options/ia64 | 2 | ||||
-rw-r--r-- | build/arch-options/m68k | 21 | ||||
-rw-r--r-- | build/arch-options/mips | 2 | ||||
-rw-r--r-- | build/arch-options/mipsel | 2 | ||||
-rw-r--r-- | build/arch-options/powerpc | 2 | ||||
-rw-r--r-- | build/arch-options/s390 | 2 | ||||
-rw-r--r-- | build/arch-options/sparc | 2 | ||||
-rwxr-xr-x | build/build.sh | 2 | ||||
-rw-r--r-- | build/entities/common.ent | 3 | ||||
-rw-r--r-- | build/entities/install-docs.ent | 14 | ||||
-rw-r--r-- | build/entities/tftp-images.ent | 9 | ||||
-rw-r--r-- | build/entities/urls.ent | 22 | ||||
-rw-r--r-- | build/templates/docstruct.ent | 6 |
17 files changed, 13 insertions, 84 deletions
diff --git a/build/arch-options/amd64 b/build/arch-options/amd64 index 0a8265eeb..dda2eec6d 100644 --- a/build/arch-options/amd64 +++ b/build/arch-options/amd64 @@ -2,7 +2,7 @@ # the 'amd64' architecture # It is sourced by the build scripts -archspec="amd64;x86;not-s390;not-m68k;not-powerpc;not-alpha" +archspec="amd64;x86;not-s390;not-powerpc;not-alpha" arch_listname="amd64" minimum_memory=56 minimum_memory_gtk=96 diff --git a/build/arch-options/armel b/build/arch-options/armel index f430c2cc4..2ffecff38 100644 --- a/build/arch-options/armel +++ b/build/arch-options/armel @@ -6,7 +6,7 @@ # 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-m68k;not-powerpc;not-alpha" +archspec="arm;not-x86;not-s390;not-powerpc;not-alpha" arch_listname="arm" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/hppa b/build/arch-options/hppa index ee31843d6..2f1342559 100644 --- a/build/arch-options/hppa +++ b/build/arch-options/hppa @@ -2,7 +2,7 @@ # the 'hppa' architecture # It is sourced by the build scripts -archspec="hppa;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" +archspec="hppa;not-x86;not-s390;not-powerpc;not-alpha" arch_listname="hppa" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/i386 b/build/arch-options/i386 index e6b999702..97f3b2b69 100644 --- a/build/arch-options/i386 +++ b/build/arch-options/i386 @@ -2,7 +2,7 @@ # the 'i386' architecture # It is sourced by the build scripts -archspec="i386;x86;not-s390;not-m68k;not-powerpc;not-alpha" +archspec="i386;x86;not-s390;not-powerpc;not-alpha" arch_listname="boot" minimum_memory=44 minimum_memory_gtk=96 diff --git a/build/arch-options/ia64 b/build/arch-options/ia64 index 4f2fd4a7f..9d7c4ac07 100644 --- a/build/arch-options/ia64 +++ b/build/arch-options/ia64 @@ -2,7 +2,7 @@ # the 'ia64' architecture # It is sourced by the build scripts -archspec="ia64;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" +archspec="ia64;not-x86;not-s390;not-powerpc;not-alpha" arch_listname="ia64" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/m68k b/build/arch-options/m68k deleted file mode 100644 index ef12e6ff3..000000000 --- a/build/arch-options/m68k +++ /dev/null @@ -1,21 +0,0 @@ -# This file contains architecture specific variables for -# the 'm68k' architecture -# It is sourced by the build scripts - -archspec="m68k;not-x86;not-s390;not-powerpc;not-alpha" -arch_listname="68k" -minimum_memory=32 -# 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="atari-fdisk.txt;mac-fdisk.txt;amiga-fdisk.txt;pmac-fdisk.txt" -network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot" -boot="supports-floppy-boot;bootable-disk" -frontend="newt;not-gtk" -other="supports-serial-console" -smp="" -goodies="supports-lang-chooser" -status="checked" diff --git a/build/arch-options/mips b/build/arch-options/mips index 4ad68528f..17ba3e773 100644 --- a/build/arch-options/mips +++ b/build/arch-options/mips @@ -2,7 +2,7 @@ # the 'mips' architecture # It is sourced by the build scripts -archspec="mips;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" +archspec="mips;not-x86;not-s390;not-powerpc;not-alpha" arch_listname="mips" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel index 9a1665963..02533e23d 100644 --- a/build/arch-options/mipsel +++ b/build/arch-options/mipsel @@ -2,7 +2,7 @@ # the 'mipsel' architecture # It is sourced by the build scripts -archspec="mipsel;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" +archspec="mipsel;not-x86;not-s390;not-powerpc;not-alpha" arch_listname="mips" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc index 1b749f540..86ba111fb 100644 --- a/build/arch-options/powerpc +++ b/build/arch-options/powerpc @@ -2,7 +2,7 @@ # the 'powerpc' architecture # It is sourced by the build scripts -archspec="powerpc;not-s390;not-m68k;not-x86;not-alpha" +archspec="powerpc;not-s390;not-x86;not-alpha" arch_listname="powerpc" minimum_memory=32 minimum_memory_gtk=128 diff --git a/build/arch-options/s390 b/build/arch-options/s390 index fb8caa02c..9d642692c 100644 --- a/build/arch-options/s390 +++ b/build/arch-options/s390 @@ -2,7 +2,7 @@ # the 's390' architecture # It is sourced by the build scripts -archspec="s390;not-powerpc;not-m68k;not-x86;not-alpha" +archspec="s390;not-powerpc;not-x86;not-alpha" arch_listname="s390" minimum_memory=20 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/sparc b/build/arch-options/sparc index a07ca2247..c75b63a1f 100644 --- a/build/arch-options/sparc +++ b/build/arch-options/sparc @@ -2,7 +2,7 @@ # the 'sparc' architecture # It is sourced by the build scripts -archspec="sparc;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" +archspec="sparc;not-x86;not-s390;not-powerpc;not-alpha" arch_listname="sparc" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/build/build.sh b/build/build.sh index e1a0fb9ff..5fee7e15d 100755 --- a/build/build.sh +++ b/build/build.sh @@ -15,7 +15,7 @@ fi if [ -z "$architectures" ]; then # Note: this list is no longer being maintained; see debian/archlist instead - architectures="alpha amd64 armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc" + architectures="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc" fi if [ -z "$destination" ]; then diff --git a/build/entities/common.ent b/build/entities/common.ent index c20f37c78..a1fdd779e 100644 --- a/build/entities/common.ent +++ b/build/entities/common.ent @@ -17,7 +17,7 @@ <!-- proper nouns for architectures --> <!ENTITY arch-title - "<phrase arch='amd64'>AMD64</phrase><phrase arch='alpha'>Alpha</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='m68k'>Motorola 680x0</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='amd64'>AMD64</phrase><phrase arch='alpha'>Alpha</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>"> <!ENTITY kernelversion "2.6.29"> @@ -130,7 +130,6 @@ to first switch tasksel to that DE using the following command, e.g: <phrase arch='hppa'>21600</phrase> <phrase arch='i386'>22600</phrase> <phrase arch='ia64'>21900</phrase> - <phrase arch='m68k'>17450</phrase> <phrase arch='mips'>21950</phrase> <phrase arch='mipsel'>21900</phrase> <phrase arch='powerpc'>22250</phrase> diff --git a/build/entities/install-docs.ent b/build/entities/install-docs.ent index 401fe5dde..d05947c38 100644 --- a/build/entities/install-docs.ent +++ b/build/entities/install-docs.ent @@ -55,17 +55,3 @@ <!ENTITY loadlin.exe ' <ulink url="&downloadable-file;dosutils/loadlin.exe">.../current/dosutils/loadlin.exe</ulink> '> - -<!-- m68k misc files checked 2004-07-28 --> - - <!ENTITY rawwrite.ttp ' -<ulink url="&downloadable-file;images/atari/rawwrite.ttp">.../current/images/atari/rawwrite.ttp</ulink> - '> - - <!ENTITY penguin19.hfs ' -<ulink url="&downloadable-file;images/mac/penguin19.hfs">.../current/images/mac/penguin19.hfs</ulink> - '> - - <!ENTITY ramdisksize ' -<userinput>ramdisk_size=13000</userinput> - '> diff --git a/build/entities/tftp-images.ent b/build/entities/tftp-images.ent index c07f791ff..4fa203c45 100644 --- a/build/entities/tftp-images.ent +++ b/build/entities/tftp-images.ent @@ -36,15 +36,6 @@ <ulink url="&downloadable-file;images/orion5x/netboot/qnap/">.../images/orion5x/netboot/qnap/</ulink> '> -<!-- m68k updated 2004-11-04 --> - - <!ENTITY bvme6000-tftp-files ' -<ulink url="&downloadable-file;images/kernels/vmlinuz-2.4.27-bvme6000">.../images/kernel/vmlinuz-2.4.27-bvme6000</ulink>, -<ulink url="&downloadable-file;images/netboot/initrd.gz">.../images/netboot/initrd.gz</ulink>, -<ulink url="&downloadable-file;images/netboot/tftplilo.bvme">.../images/netboot/tftplilo.bvme</ulink>, and -<ulink url="&downloadable-file;images/netboot/tftplilo.conf">.../images/netboot/tftplilo.conf</ulink> -'> - <!-- --> <!-- tftp disk images: proper --> <!-- --> diff --git a/build/entities/urls.ent b/build/entities/urls.ent index a4bfde41b..35f6d22f5 100644 --- a/build/entities/urls.ent +++ b/build/entities/urls.ent @@ -212,30 +212,10 @@ <!-- ****************************************** m68k links --> -<!-- - urls that I need to absorb or point to: - http://www.informatik.uni-oldenburg.de/~amigo/debian_inst.html - http://www.linux-m68k.org/debian-atari.html - http://www.linux-m68k.org/debian-mac.html - http://www.mac.linux-m68k.org/docs/debian-mac68k-install.html - http://www.mac.linux-m68k.org/docs/debian-mac-install.html - ftp://baltimore.wwaves.com/pub/MacLinux/debian-support/Debian-2.0-Mac-Install.html (outdated by above?) - http://www.sleepie.demon.co.uk/linuxvme/ - - NetBSD has some nice documentation: - http://www.netbsd.org/Ports/atari/faq.html - ftp://ftp.NetBSD.ORG/pub/NetBSD/NetBSD-1.3.3/atari/INSTALL - http://www.netbsd.org/Ports/amiga/index.html (sup/unsup hardware) - ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-1.3.3/mvme68k/INSTALL - --> - -<!ENTITY url-m68k-cts-faq "http://people.debian.org/~cts/debian-m68k/sarge/"> +<!-- still used for credits in administrativa --> <!ENTITY url-m68k-faq "http://www.linux-m68k.org/faq/faq.html"> -<!ENTITY url-m68k-mac "http://sourceforge.net/projects/linux-mac68k"> - -<!-- old amiga install guide, for credits only --> <!ENTITY url-m68k-old-amiga-install "http://www.informatik.uni-oldenburg.de/~amigo/debian_inst.html"> <!-- ****************************************** alpha links --> diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent index 24cad5e2c..6378eb92f 100644 --- a/build/templates/docstruct.ent +++ b/build/templates/docstruct.ent @@ -21,7 +21,6 @@ <!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-m68k.xml SYSTEM "##SRCPATH##/hardware/supported/m68k.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"> @@ -42,12 +41,10 @@ <!ENTITY non-debian-partitioning.xml SYSTEM "##SRCPATH##/preparing/non-debian-partitioning.xml"> <!ENTITY nondeb-part-alpha.xml SYSTEM "##SRCPATH##/preparing/nondeb-part/alpha.xml"> <!ENTITY nondeb-part-x86.xml SYSTEM "##SRCPATH##/preparing/nondeb-part/x86.xml"> - <!ENTITY nondeb-part-m68k.xml SYSTEM "##SRCPATH##/preparing/nondeb-part/m68k.xml"> <!ENTITY nondeb-part-powerpc.xml SYSTEM "##SRCPATH##/preparing/nondeb-part/powerpc.xml"> <!ENTITY nondeb-part-sparc.xml SYSTEM "##SRCPATH##/preparing/nondeb-part/sparc.xml"> <!ENTITY pre-install-bios-setup.xml SYSTEM "##SRCPATH##/preparing/pre-install-bios-setup.xml"> <!ENTITY bios-setup-i386.xml SYSTEM "##SRCPATH##/preparing/bios-setup/i386.xml"> - <!ENTITY bios-setup-m68k.xml SYSTEM "##SRCPATH##/preparing/bios-setup/m68k.xml"> <!ENTITY bios-setup-powerpc.xml SYSTEM "##SRCPATH##/preparing/bios-setup/powerpc.xml"> <!ENTITY bios-setup-s390.xml SYSTEM "##SRCPATH##/preparing/bios-setup/s390.xml"> <!ENTITY bios-setup-sparc.xml SYSTEM "##SRCPATH##/preparing/bios-setup/sparc.xml"> @@ -57,13 +54,11 @@ <!ENTITY downloading-files.xml SYSTEM "##SRCPATH##/install-methods/downloading-files.xml"> <!ENTITY download-alpha.xml SYSTEM "##SRCPATH##/install-methods/download/alpha.xml"> <!ENTITY download-arm.xml SYSTEM "##SRCPATH##/install-methods/download/arm.xml"> - <!ENTITY download-m68k.xml SYSTEM "##SRCPATH##/install-methods/download/m68k.xml"> <!ENTITY download-powerpc.xml SYSTEM "##SRCPATH##/install-methods/download/powerpc.xml"> <!ENTITY ipl-tape.xml SYSTEM "##SRCPATH##/install-methods/ipl-tape.xml"> <!ENTITY create-floppy.xml SYSTEM "##SRCPATH##/install-methods/create-floppy.xml"> <!ENTITY floppy-i386.xml SYSTEM "##SRCPATH##/install-methods/floppy/i386.xml"> - <!ENTITY floppy-m68k.xml SYSTEM "##SRCPATH##/install-methods/floppy/m68k.xml"> <!ENTITY floppy-powerpc.xml SYSTEM "##SRCPATH##/install-methods/floppy/powerpc.xml"> <!ENTITY boot-usb-files.xml SYSTEM "##SRCPATH##/install-methods/boot-usb-files.xml"> @@ -88,7 +83,6 @@ <!ENTITY boot-installer-intro-hd.xml SYSTEM "##SRCPATH##/boot-installer/intro-hd.xml"> <!ENTITY boot-installer-intro-net.xml SYSTEM "##SRCPATH##/boot-installer/intro-net.xml"> <!ENTITY boot-installer-intro-firmware.xml SYSTEM "##SRCPATH##/boot-installer/intro-firmware.xml"> - <!ENTITY boot-installer-m68k.xml SYSTEM "##SRCPATH##/boot-installer/m68k.xml"> <!ENTITY boot-installer-mips.xml SYSTEM "##SRCPATH##/boot-installer/mips.xml"> <!ENTITY boot-installer-mipsel.xml SYSTEM "##SRCPATH##/boot-installer/mipsel.xml"> <!ENTITY boot-installer-powerpc.xml SYSTEM "##SRCPATH##/boot-installer/powerpc.xml"> |