From 3bec381546387882a265515a4e65716fa8e691c7 Mon Sep 17 00:00:00 2001
From: agaffney <agaffney@kagome.(none)>
Date: Mon, 28 Jul 2008 21:31:46 -0500
Subject: [PATCH] Remove a few more 2.4 kernel support remnants

---
 ChangeLog           |  4 ++++
 gen_bootloader.sh   |  5 +----
 gen_configkernel.sh | 17 ++++-------------
 gen_moddeps.sh      |  7 +------
 genkernel.8         |  4 +---
 5 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3ad628a..9780d05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni
 # Distributed under the GPL v2
 
+  29 Jul 2008; Andrew Gaffney <agaffney@gentoo.org> gen_bootloader.sh,
+  gen_configkernel.sh, gen_moddeps.sh, genkernel.8:
+  Remove a few more 2.4 kernel support remnants
+
   29 Jul 2008; Andrew Gaffney <agaffney@gentoo.org> gen_arch.sh, genkernel:
   Cleanup remaining references to ${ARCH}/ without arch/ prefix
 
diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 17ec15e..5e3291c 100644
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -61,10 +61,7 @@ EOF
 				echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
 			else
 				echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=/dev/ram0 init=/linuxrc real_root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
-				if [ "${PAT}" -gt '4' ]
-				then
-				    echo -e "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF}
-				fi
+			    echo -e "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF}
 			fi
 			echo >> ${GRUB_CONF}
 		else
diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 278fc49..053bd4a 100644
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -64,20 +64,11 @@ config_kernel() {
 		[ "$?" ] || gen_die 'Error: menuconfig failed!'
 	elif isTrue ${CMD_GCONFIG}
 	then
-		if [ "${VER}" == '2' ] && [ "${PAT}" -lt '6' ]
-		then
-			print_warning 1 'config: gconfig is not available in 2.4 series kernels. Running xconfig'
-			print_warning 1 '        instead...'
+		print_info 1 'config: >> Invoking gconfig...'
+		compile_generic gconfig kernel
+		[ "$?" ] || gen_die 'Error: gconfig failed!'
 
-			CMD_GCONFIG=0
-			CMD_XCONFIG=1
-		else
-			print_info 1 'config: >> Invoking gconfig...'
-			compile_generic gconfig kernel
-			[ "$?" ] || gen_die 'Error: gconfig failed!'
-
-			CMD_XCONFIG=0
-		fi
+		CMD_XCONFIG=0
 	fi
 
 	if isTrue ${CMD_XCONFIG}
diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 97216d0..caf60f2 100644
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -2,12 +2,7 @@
 
 modules_kext()
 {
-	if [ "${PAT}" -gt "4" ]
-	then
-		KEXT=".ko"
-	else
-		KEXT=".o"
-	fi
+	KEXT=".ko"
 	echo ${KEXT}
 }
 
diff --git a/genkernel.8 b/genkernel.8
index 02d68b7..e07f7bb 100644
--- a/genkernel.8
+++ b/genkernel.8
@@ -169,9 +169,7 @@ Linker to use for utilities.
 GNU Make to use for utilities.
 .TP
 \fB\-\-makeopts=\fR<makeopts>
-GNU Make options such as \fB\-j2\fR, etc. \fB\-j\fRX is filtered during the
-module compilation stage of 2.4 series kernels to avoid bottlenecks; the
-2.6 build system does not have this issue and \fB\-j\fRX is not filtered for it.
+GNU Make options such as \fB\-j2\fR, etc.
 .PP
 .BR Initialization
 .TP
-- 
2.26.2