Update generate_di* scripts for etchnhalf netinst

- include the etchnhalf kernels
- busybox is not needed by initramfs-tools in etch
- acpi-support-base does not exist in etch
- m68k is not a release arch for etch

etchnhalf/tools/generate_di+k_list

@@ -61,7 +61,6 @@ reiserfsprogs
 libfribidi0
 localization-config
 acpid
-acpi-support-base
 ppp
 pppoeconf
 udev
@@ -95,7 +94,6 @@ bpalogin
 
 #ifdef ARCH_i386
 initramfs-tools
-busybox
 discover
 discover1
 libdiscover1
@@ -110,15 +108,14 @@ libc6-i686
  * Kernel headers are included as third party modules are commonly
  * used on this architecture.
  */
-linux-image-2.6-486
-linux-headers-2.6-486
-linux-image-2.6-686
-linux-headers-2.6-686
+linux-image-2.6-486-etchnhalf
+linux-headers-2.6-486-etchnhalf
+linux-image-2.6-686-etchnhalf
+linux-headers-2.6-686-etchnhalf
 #endif
 
 #ifdef ARCH_amd64
 initramfs-tools
-busybox
 discover
 discover1
 libdiscover1
@@ -126,42 +123,39 @@ grub
 grub-pc
 laptop-detect
 lilo
-linux-image-2.6-amd64
-linux-headers-2.6-amd64
+linux-image-2.6-amd64-etchnhalf
+linux-headers-2.6-amd64-etchnhalf
 #endif
 
 #ifdef ARCH_alpha
 initramfs-tools
-busybox
 aboot
 aboot-base
 discover1
 libdiscover1
-linux-image-2.6-alpha-generic
-linux-image-2.6-alpha-smp
+linux-image-2.6-alpha-generic-etchnhalf
+linux-image-2.6-alpha-smp-etchnhalf
 #endif
 
 #ifdef ARCH_hppa
 initramfs-tools
-busybox
 discover1
 libdiscover1
-linux-image-2.6-parisc
-linux-image-2.6-parisc-smp
-linux-image-2.6-parisc64
-linux-image-2.6-parisc64-smp
+linux-image-2.6-parisc-etchnhalf
+linux-image-2.6-parisc-smp-etchnhalf
+linux-image-2.6-parisc64-etchnhalf
+linux-image-2.6-parisc64-smp-etchnhalf
 palo
 #endif
 
 #ifdef ARCH_ia64
 initramfs-tools
-busybox
 discover1
 libdiscover1
-linux-image-2.6-itanium
-linux-image-2.6-itanium-smp
-linux-image-2.6-mckinley
-linux-image-2.6-mckinley-smp
+linux-image-2.6-itanium-etchnhalf
+linux-image-2.6-itanium-smp-etchnhalf
+linux-image-2.6-mckinley-etchnhalf
+linux-image-2.6-mckinley-smp-etchnhalf
 elilo
 #endif
 
@@ -169,10 +163,10 @@ elilo
 /* doesn't use a initrd to boot */
 arcboot
 sibyl
-linux-image-2.6-r4k-ip22
-linux-image-2.6-r5k-ip32
-linux-image-2.6-sb1-bcm91250a
-linux-image-2.6-sb1a-bcm91480b
+linux-image-2.6-r4k-ip22-etchnhalf
+linux-image-2.6-r5k-ip32-etchnhalf
+linux-image-2.6-sb1-bcm91250a-etchnhalf
+linux-image-2.6-sb1a-bcm91480b-etchnhalf
 #endif
 
 #ifdef ARCH_mipsel
@@ -180,16 +174,15 @@ linux-image-2.6-sb1a-bcm91480b
 sibyl
 colo
 delo
-linux-image-2.6-r3k-kn02
-linux-image-2.6-r4k-kn04
-linux-image-2.6-r5k-cobalt
-linux-image-2.6-sb1-bcm91250a
-linux-image-2.6-sb1a-bcm91480b
+linux-image-2.6-r3k-kn02-etchnhalf
+linux-image-2.6-r4k-kn04-etchnhalf
+linux-image-2.6-r5k-cobalt-etchnhalf
+linux-image-2.6-sb1-bcm91250a-etchnhalf
+linux-image-2.6-sb1a-bcm91480b-etchnhalf
 #endif
 
 #ifdef ARCH_arm
 initramfs-tools
-busybox
 discover1
 libdiscover1
 nwutil
@@ -198,45 +191,29 @@ glantank
 flash-kernel
 nslu2-utils
 apex-nslu2
-linux-image-2.6-footbridge
-linux-image-2.6-iop32x
-linux-image-2.6-ixp4xx
-linux-image-2.6-nslu2
-linux-image-2.6-rpc
-linux-image-2.6-s3c2410
-#endif
-
-#ifdef ARCH_armel
-initramfs-tools
-busybox
-discover1
-libdiscover1
-slugimage
-flash-kernel
-nslu2-utils
-apex-nslu2
-linux-image-2.6-iop32x
-linux-image-2.6-ixp4xx
-linux-image-2.6-versatile
+linux-image-2.6-footbridge-etchnhalf
+linux-image-2.6-iop32x-etchnhalf
+linux-image-2.6-ixp4xx-etchnhalf
+linux-image-2.6-nslu2-etchnhalf
+linux-image-2.6-rpc-etchnhalf
+linux-image-2.6-s3c2410-etchnhalf
 #endif
 
 #ifdef ARCH_sparc
 initramfs-tools
-busybox
 silo
 discover1
 libdiscover1
 libc6-sparcv9b
 libc6-sparcv9
-linux-image-2.6-sparc32
-linux-image-2.6-sparc32-smp
-linux-image-2.6-sparc64
-linux-image-2.6-sparc64-smp
+linux-image-2.6-sparc32-etchnhalf
+linux-image-2.6-sparc32-smp-etchnhalf
+linux-image-2.6-sparc64-etchnhalf
+linux-image-2.6-sparc64-smp-etchnhalf
 #endif
 
 #ifdef ARCH_powerpc
 initramfs-tools
-busybox
 discover1
 libdiscover1
 laptop-detect
@@ -246,10 +223,10 @@ powerpc-utils
 hfsutils
 mkvmlinuz
 module-init-tools
-linux-image-2.6-powerpc
-linux-image-2.6-powerpc-smp
-linux-image-2.6-powerpc64
-linux-image-2.6-prep
+linux-image-2.6-powerpc-etchnhalf
+linux-image-2.6-powerpc-smp-etchnhalf
+linux-image-2.6-powerpc64-etchnhalf
+linux-image-2.6-prep-etchnhalf
 #endif
 
 EOF

etchnhalf/tools/generate_di_list

@@ -6,7 +6,7 @@ die "Missing \$MIRROR variable" unless $ENV{MIRROR};
 die "Missing \$DI_CODENAME variable" unless $ENV{DI_CODENAME};
 die "Missing \$BASEDIR variable" unless $ENV{BASEDIR};
 
-my @ARCHES=qw{alpha arm armel hppa hurd-i386 i386 ia64 mips mipsel
+my @ARCHES=qw{alpha arm hppa hurd-i386 i386 ia64 mips mipsel
               powerpc s390 sparc amd64};
 my $DATE=`date`;
 chomp $DATE;