[patch] patch to gen_configkernel.sh 3.0.1_rc1

gen_configkernel.sh-3.0.1_rc1-psg.diff (text/plain), 2.72 KB, created by John Richard Moser on 2004-02-25 13:59:09 UTC

--- gen_configkernel.sh.orig	2004-02-25 14:17:57.000000000 -0500
+++ gen_configkernel.sh	2004-02-25 16:45:49.879966278 -0500
@@ -1,9 +1,12 @@
 #!/bin/bash
 
 determine_config_file() {
+	GENCFGXONLY="no"
 	if [ "${CMD_KERNEL_CONFIG}" != "" ]
 	then
 		KERNEL_CONFIG="${CMD_KERNEL_CONFIG}"
+		GENCFGXONLY="yes"
+		NOCFGX="yes"
 	elif [ -f "/etc/kernels/kernel-config-${ARCH}-${KV}" ]
 	then
 		KERNEL_CONFIG="/etc/kernels/kernel-config-${ARCH}-${KV}"
@@ -13,6 +16,7 @@ determine_config_file() {
 	elif [ "${DEFAULT_KERNEL_CONFIG}" != "" -a -f "${DEFAULT_KERNEL_CONFIG}" ]
 	then
 		KERNEL_CONFIG="${DEFAULT_KERNEL_CONFIG}"
+		GENCFGXONLY="yes"
 	elif [ -f "${GK_SHARE}/${ARCH}/kernel-config-${VER}.${PAT}" ]
 	then
 		KERNEL_CONFIG="${GK_SHARE}/${ARCH}/kernel-config-${VER}.${PAT}"
@@ -24,6 +28,43 @@ determine_config_file() {
 	fi
 }
 
+determine_config_extension() {
+	# Dropdown:
+	# GENONLY && x-config, x-config-arch-kv, x-config-arch-x.y,
+	# x-config-arch, x-config
+	if isTrue ${NOCFGEX}
+	then
+		print_info 1 "Not applying configuration for:  $1"
+	elif isTrue ${GENCFGXONLY}
+	then
+		if [ -f "${GK_SHARE}/extens/$1-config" ]
+		then
+			KERNEL_CONFIG_EXTEN="${GK_SHARE}/extens/$1-config"
+		fi
+	elif [ -f "${GK_SHARE}/extens/$1-config-${ARCH}-${KV}" ]
+	then
+		KERNEL_CONFIG_EXTEN="${GK_SHARE}/extens/$1-config-${ARCH}-${KV}"
+	elif [ -f "${GK_SHARE}/extens/$1-config-${ARCH}-${VER}.${PAT}" ]
+	then
+		KERNEL_CONFIG_EXTEN="${GK_SHARE}/extens/$1-config-${ARCH}-${VER}.${PAT}"
+	elif [ -f "${GK_SHARE}/extens/$1-config-${ARCH}" ]
+	then
+		KERNEL_CONFIG_EXTEN="${GK_SHARE}/extens/$1-config-${ARCH}"
+	elif [ -f "${GK_SHARE}/extens/$1-config-${KV}" ]
+	then
+		KERNEL_CONFIG_EXTEN="${GK_SHARE}/extens/$1-config-${KV}"
+	elif [ -f "${GK_SHARE}/extens/$1-config-${VER}.${PAT}" ]
+	then
+		KERNEL_CONFIG_EXTEN="${GK_SHARE}/extens/$1-config-${VER}.${PAT}"
+	elif [ -f "${GK_SHARE}/extens/$1-config" ]
+	then
+		KERNEL_CONFIG_EXTEN="${GK_SHARE}/extens/$1-config"
+	else
+		print_info 1 "no kernel config for $1 found, skipping"
+		KERNEL_CONFIG_EXTEN=""
+	fi
+}
+
 config_kernel() {
 	print_info 1 "kernel: configuring source"
 
@@ -45,6 +86,17 @@ config_kernel() {
 		cp "${KERNEL_DIR}/.config" "${KERNEL_DIR}/.config.bak" > /dev/null 2>&1
 		cp "${KERNEL_CONFIG}" "${KERNEL_DIR}/.config" || gen_die "could not copy config file"
 
+		# need a way to use a for loop here :(
+		print_info 1 "Adding extended configurations..."
+		for i in ${EXTENS}
+		do determine_config_extension $i
+			if [ "${KERNEL_CONFIG_EXTEN}" != "" ]
+			then
+				print_info 1 "Merging $i config..."
+				cat ${KERNEL_CONFIG_EXTEN} >> ${KERNEL_DIR}/.config || gen_die "could not merge pax config"
+			fi
+		done
+
 		print_info 1 "kernel: running oldconfig"
 		yes "" | compile_generic "oldconfig" kernel