From 7e0392758007a2cd3ff95f56acfd13d90d574b9b Mon Sep 17 00:00:00 2001 From: Frans Pop Date: Mon, 2 Nov 2009 22:59:43 +0000 Subject: Remove support for m68k in build system --- build/arch-options/amd64 | 2 +- build/arch-options/armel | 2 +- build/arch-options/hppa | 2 +- build/arch-options/i386 | 2 +- build/arch-options/ia64 | 2 +- build/arch-options/m68k | 21 --------------------- build/arch-options/mips | 2 +- build/arch-options/mipsel | 2 +- build/arch-options/powerpc | 2 +- build/arch-options/s390 | 2 +- build/arch-options/sparc | 2 +- build/build.sh | 2 +- build/entities/common.ent | 3 +-- build/entities/install-docs.ent | 14 -------------- build/entities/tftp-images.ent | 9 --------- build/entities/urls.ent | 22 +--------------------- build/templates/docstruct.ent | 6 ------ 17 files changed, 13 insertions(+), 84 deletions(-) delete mode 100644 build/arch-options/m68k (limited to 'build') 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 @@ AMD64AlphaARMPA-RISCIntel x86IA-64Motorola 680x0MipsMipselPowerPCSPARCS/390"> + "AMD64AlphaARMPA-RISCIntel x86IA-64MipsMipselPowerPCSPARCS/390"> @@ -130,7 +130,6 @@ to first switch tasksel to that DE using the following command, e.g: 21600 22600 21900 - 17450 21950 21900 22250 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 @@ .../current/dosutils/loadlin.exe '> - - - - .../current/images/atari/rawwrite.ttp - '> - - .../current/images/mac/penguin19.hfs - '> - - ramdisk_size=13000 - '> 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 @@ .../images/orion5x/netboot/qnap/ '> - - - .../images/kernel/vmlinuz-2.4.27-bvme6000, -.../images/netboot/initrd.gz, -.../images/netboot/tftplilo.bvme, and -.../images/netboot/tftplilo.conf -'> - 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 @@ - - - + - - - 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 @@ - @@ -42,12 +41,10 @@ - - @@ -57,13 +54,11 @@ - - @@ -88,7 +83,6 @@ - -- cgit v1.2.3