[patch] Patch corrects other minor issues (and closes two other bugs).

genkernel-misc.patch (text/plain), 3.15 KB, created by John R. Graham on 2007-05-28 23:57:49 UTC

diff -ub old/gen_determineargs.sh new/gen_determineargs.sh
--- old/gen_determineargs.sh	2007-05-28 17:39:51.000000000 -0400
+++ new/gen_determineargs.sh	2007-05-28 17:22:41.000000000 -0400
@@ -274,10 +274,12 @@
 	then
 		MRPROPER="${CMD_MRPROPER}"
 	fi
+
 	if [ "${CMD_MENUCONFIG}" != '' ]
 	then
 		MENUCONFIG="${CMD_MENUCONFIG}"
 	fi
+
 	if [ "${CMD_CLEAN}" != '' ]
 	then
 		CLEAN="${CMD_CLEAN}"
@@ -391,7 +393,12 @@
 		fi
 	fi
 
-	if isTrue "${CMD_OLDCONFIG}"
+	if [ "${CMD_OLDCONFIG}" != '' ]
+	then
+		OLDCONFIG="${CMD_OLDCONFIG}"
+	fi
+
+	if isTrue "${OLDCONFIG}"
 	then
 		OLDCONFIG=1
 	else
diff -ub old/genkernel new/genkernel
--- old/genkernel	2007-05-28 17:39:51.000000000 -0400
+++ new/genkernel	2007-05-28 17:22:41.000000000 -0400
@@ -4,8 +4,10 @@
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
 GK_V='3.4.8'
 
+# Set the default for TMPDIR.  May be modified by genkernel.conf or the
+# --tempdir command line option.
 TMPDIR='/var/tmp/genkernel'
-TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
+
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.
 
 small_die() {
@@ -26,6 +28,8 @@
 source ${GK_BIN}/gen_package.sh || gen_die "Could not read ${GK_BIN}/gen_package.sh"
 source ${GK_BIN}/gen_bootloader.sh || gen_die "Could not read ${GK_BIN}/gen_bootloader.sh"
 
+TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
+
 trap_cleanup(){
 	# Call exit code of 1 for failure
 	cleanup
diff -ub old/genkernel.8 new/genkernel.8
--- old/genkernel.8	2007-05-28 17:39:51.000000000 -0400
+++ new/genkernel.8	2007-05-28 19:30:42.000000000 -0400
@@ -55,8 +55,7 @@
 possible is given.
 .TP
 \fB\-\-debugfile=\fR<outfile>
-This outputs full debugging data; regardless of --debuglevel to the file 
-<outfile>. By default this is
+This outputs debugging data to the file <outfile>. By default this is
 .I /var/log/genkernel.log\fR.
 .TP
 \fB\-\-\fR[no\-]\fBcolor\fR
@@ -221,6 +220,9 @@
 \fB\-\-arch\-override=\fR<arch>
 Force the architecture settings described by the <arch> profile
 instead of autodetecting the running architecture.
+.TP
+\fB\-\-tempdir=\fR<dir>
+Sets genkernel's temporary working directory to <dir>.
 .PP
 .BR Output \ Settings
 .TP
diff -ub old/genkernel.conf new/genkernel.conf
--- old/genkernel.conf	2007-05-28 18:17:22.000000000 -0400
+++ new/genkernel.conf	2007-05-28 18:27:01.000000000 -0400
@@ -2,6 +2,11 @@
 
 # ===========GENKERNEL BASIC CONFIGURATION=============
 
+# Run 'make oldconfig' before compiling this kernel?
+# If set to "yes", also suppresses the fetch of the kernel .config file from
+# /etc/kernels, thus preserving the .config file in /usr/src/linux.
+# OLDCONFIG="no"
+
 # Run 'make menuconfig' before compiling this kernel?
 MENUCONFIG="no"
 
@@ -23,6 +28,9 @@
 # Mount BOOTDIR automatically if it isn't mounted?
 MOUNTBOOT="yes"
 
+# Make symlinks in BOOTDIR automatically?
+# SYMLINK="no"
+
 # Save the new configuration in /etc/kernels upon
 # successfull compilation
 SAVE_CONFIG="yes"
@@ -48,6 +56,9 @@
 #   %%ARCH%%  - Final determined architecture
 #   %%CACHE%% - Final determined cache location
 
+# Set genkernel's temporary work directory.  Default is /var/tmp/genkernel
+# TMPDIR="/var/tmp/genkernel"
+
 # Set the boot directory, default is /boot
 #BOOTDIR="/boot"