Fix #95993, #96300.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@214 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index e6c43f636591c1dbf8734636d973ce94b278bdc7..f03522f369b0d77fb957e1d254adfede1141cfee 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -7,6 +7,7 @@ longusage() {
   echo
   echo "Available Actions: "
   echo "  all                          Build all steps"
+  echo "  bzImage                      Build only the kernel"
   echo "  kernel                       Build only the kernel and modules"
   echo "  initrd                       Build only the initrd"
   echo
@@ -390,6 +391,7 @@ parse_cmdline() {
              ;;
              all)
                      BUILD_KERNEL=1
+                     BUILD_MODULES=1
                      BUILD_INITRD=1
              ;;
              initrd)
@@ -397,8 +399,16 @@ parse_cmdline() {
              ;;
              kernel)
                      BUILD_KERNEL=1
+                     BUILD_MODULES=1
                      BUILD_INITRD=0
              ;;
+             bzImage)
+                     BUILD_KERNEL=1
+                     BUILD_MODULES=0
+                     BUILD_INITRD=1
+                     CMD_NOINITRDMODULES=1
+                     print_info 2 "CMD_NOINITRDMODULES: $CMD_NOINITRDMODULES"
+             ;;
              --help)
                      longusage
                      exit 1

diff --git a/genkernel b/genkernel
index ef7fc2a6c2abb444b56a70fde1001c5c86486e68..bbbb3b3033f13660985dc82da16516c1449b2942 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Genkernel v3
 
-GK_V='3.2.0_pre5'
+GK_V='3.2.0_pre9'
 TEMP='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.
 
@@ -36,6 +36,7 @@ cleanup(){
 trap cleanup SIGHUP SIGQUIT SIGINT SIGTERM SIGKILL
 BUILD_KERNEL=0
 BUILD_INITRD=0
+BUILD_MODULES=0
 
 # Parse all command line options...
 Options=$* # Save for later
@@ -183,7 +184,10 @@ then
        [ "${GENERATE_Z_IMAGE}" = '' ] && compile_kernel
 
        # Compile modules
-       compile_modules
+       if [ ${BUILD_MODULES} -eq 1 ]
+       then
+               compile_modules
+       fi
 
        if [ ${SAVE_CONFIG} -eq 1 ]
        then

diff --git a/genkernel.8 b/genkernel.8
index d4255594ef8407bf1146c899dbc1c8a11f1483ad..f525f7fa3b64c3a5773adb3a821ccdeef08b8719 100644 (file)
--- a/genkernel.8
+++ b/genkernel.8
@@ -1,4 +1,4 @@
-.TH GENKERNEL "8" "November 2004" "genkernel 3.1.0c" "Gentoo Linux"
+.TH GENKERNEL "8" "June 2005" "genkernel 3.2.0" "Gentoo Linux"
 .SH NAME
 genkernel \- the Gentoo Linux automatic kernel compiler.
 .SH SYNOPSIS
@@ -252,7 +252,7 @@ If present, the initrd will try to mount a livecd from that location. Otherwise
 The initrd scripts have limited support for network booting.
 This is activated if the ip=<...> kernel parameter was given. Please refer to the genkernel guide at http://www.gentoo.org/doc/en/genkernel.xml for more information.
 
-The initrd scripts will extract any *.tar.gz files found in the \fB/add\fR directory of the livecd into the root filesystem during boot. This way its easy to extend a netbooted livecd i.e. with custom tools, or other kernel modules.
+The initrd scripts will extract any *.tar.gz files found in the \fB/add\fR directory of the livecd into the root filesystem during boot. This way it is easy to extend a netbooted LiveCD i.e. add custom tools, or other kernel modules.
 .SH REPORTING BUGS
 If you believe you have found a bug in the genkernel scripts, then please
 file a bug on the Gentoo Linux Bugzilla: