From fa8a2837be52fef490da1230fbee989726c552e7 Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Thu, 27 Jul 2006 10:25:48 +0000
Subject: [PATCH] Drop 2.4 support for sparc64; switch from 2.4 to 2.6 for
 sparc32

---
 data/etch/sparc/debian.txt |  3 ++-
 data/etch/sparc/silo.conf  | 17 +++--------------
 debian/changelog           |  5 ++++-
 tools/boot/etch/boot-sparc | 20 ++++++--------------
 4 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/data/etch/sparc/debian.txt b/data/etch/sparc/debian.txt
index ffa03a74..1bae0c63 100644
--- a/data/etch/sparc/debian.txt
+++ b/data/etch/sparc/debian.txt
@@ -13,4 +13,5 @@ WARNING: You should completely back up all of your hard disks before
 Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent permitted
 by applicable law.
 
-[ ENTER - Boot install ]   [ Type "rescue" - Boot into rescue mode ]
+[ ENTER - Boot install ]   [ Type "expert" - Boot into expert mode ]
+                           [ Type "rescue" - Boot into rescue mode ]
diff --git a/data/etch/sparc/silo.conf b/data/etch/sparc/silo.conf
index b2a07efb..1999be10 100644
--- a/data/etch/sparc/silo.conf
+++ b/data/etch/sparc/silo.conf
@@ -6,30 +6,19 @@ append="cdrom ramdisk_size=16384"
 root=/dev/ram
 
 ### sparc64 boot images
-image[sun4u]=/boot/2.6/sparc64
-   label=install
-   initrd=/boot/2.6/initrd.gz
 image[sun4u]=/boot/sparc64
-   label=install24
+   label=install
    initrd=/boot/initrd.gz
 
 # sparc64 expert boots
-image[sun4u]=/boot/2.6/sparc64
-   label=expert
-   initrd=/boot/2.6/initrd.gz
-   append="debconf/priority=low"
 image[sun4u]=/boot/sparc64
-   label=expert24
+   label=expert
    initrd=/boot/initrd.gz
    append="debconf/priority=low"
 
 # sparc64 rescue boots
-image[sun4u]=/boot/2.6/sparc64
-   label=rescue
-   initrd=/boot/2.6/initrd.gz
-   append="rescue/enable=true"
 image[sun4u]=/boot/sparc64
-   label=rescue24
+   label=rescue
    initrd=/boot/initrd.gz
    append="rescue/enable=true"
 
diff --git a/debian/changelog b/debian/changelog
index b98c2785..603ef760 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -78,7 +78,10 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
   * Add 686 kernels, since the netinst CD is much larger and can now easily
     fit them and this makes the CD much more attractive for many users.
 
- -- Frans Pop <fjp@debian.org>  Sun, 16 Jul 2006 20:27:58 +0200
+  [ Frans Pop ]
+  * Drop 2.4 support for sparc64; switch from 2.4 to 2.6 for sparc32.
+
+ -- Frans Pop <fjp@debian.org>  Thu, 27 Jul 2006 12:23:18 +0200
 
 debian-cd (2.2.24) unstable; urgency=low
 
diff --git a/tools/boot/etch/boot-sparc b/tools/boot/etch/boot-sparc
index ac99dacc..ed7fd226 100755
--- a/tools/boot/etch/boot-sparc
+++ b/tools/boot/etch/boot-sparc
@@ -62,24 +62,16 @@ if [ ! "$DI_WWW_HOME" ];then
 	fi
 else
 	DI_DIR="."
-	wget "$DI_WWW_HOME" -O di.dir
-	sparc32=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc32\)".*/\1/p' di.dir)
-	sparc64=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc64\)".*/\1/p' di.dir)
-	wget "$DI_WWW_HOME/$sparc32" -O vmlinuz-x-sparc32
-	wget "$DI_WWW_HOME/$sparc64" -O vmlinuz-x-sparc64
-	wget "$DI_WWW_HOME/initrd.gz"
 
-	mkdir ./2.6
 	DI_WWW_HOME=$DI_WWW_HOME/2.6
-	wget "$DI_WWW_HOME" -O ./2.6/di.dir
-	sparc64=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc64\)".*/\1/p' ./2.6/di.dir)
-	wget "$DI_WWW_HOME/$sparc64" -O ./2.6/vmlinuz-x-sparc64
-	wget "$DI_WWW_HOME/initrd.gz" -O ./2.6/initrd.gz
+	wget "$DI_WWW_HOME" -O di.dir
+	sparc32=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc32\)".*/\1/p' ./di.dir)
+	sparc64=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc64\)".*/\1/p' ./di.dir)
+	wget "$DI_WWW_HOME/$sparc32" -O ./vmlinuz-x-sparc32
+	wget "$DI_WWW_HOME/$sparc64" -O ./vmlinuz-x-sparc64
+	wget "$DI_WWW_HOME/initrd.gz"
 fi
 
 cp "$DI_DIR"/initrd.gz "$inst/boot/initrd.gz"
 cp "$DI_DIR"/vmlinuz-*-sparc32 "$inst/boot/sparc32"
 zcat "$DI_DIR"/vmlinuz-*-sparc64 > "$inst/boot/sparc64"
-
-cp "$DI_DIR"/2.6/initrd.gz "$inst/boot/2.6/initrd.gz"
-zcat "$DI_DIR"/2.6/vmlinuz-*-sparc64 > "$inst/boot/2.6/sparc64"