From 899b81e78a6246ef1298da5d8a3e397dff9c7730 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 28 Sep 2004 12:18:53 +0000
Subject: [PATCH]     - Put 2.4, not 2.6 kernels on hppa cd.

---
 debian/changelog              | 1 +
 tasks/debian-installer+kernel | 8 ++++----
 tools/generate_di+k_list      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f0d8b9b..c722710d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ debian-cd (2.2.20) UNRELEASED; urgency=low
     - Add 2.6 kernels to ia64 netinst CDs (and incidentially, update to
       2.4.27).
     - Drop i386 floppies that have gone away in d-i.
+    - Put 2.4, not 2.6 kernels on hppa cd.
   * Stephen R. Marenka
     - Add support for m68k reorganization.
     - Bump m68k 2.4 kernels to 2.4.27.
diff --git a/tasks/debian-installer+kernel b/tasks/debian-installer+kernel
index 996c446b..9704501c 100644
--- a/tasks/debian-installer+kernel
+++ b/tasks/debian-installer+kernel
@@ -57,10 +57,10 @@ kernel-image-netbootable
 #endif
 #ifdef ARCH_hppa
 discover1
-kernel-image-2.6.8-1-32-smp
-kernel-image-2.6.8-1-64
-kernel-image-2.6.8-1-64-smp
-kernel-image-netbootable
+kernel-image-2.4.27-32
+kernel-image-2.4.27-32-smp
+kernel-image-2.4.27-64
+kernel-image-2.4.27-64-smp
 #endif
 #ifdef ARCH_ia64
 discover1
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 7a10a5d1..bba2b35c 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -73,7 +73,7 @@ cat >> debian-installer+kernel << EOF
 discover1
 EOF
 
-/bin/sed -n 's/Package: \(kernel-image-.*\)$/\1/p' \
+/bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-hppa/Packages|tail -n4 \
   >> debian-installer+kernel