full documentation in --help and man page for all new options

3 files changed, 34 insertions, 10 deletions

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index cb245c3..ee93230 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -341,8 +341,8 @@ OUTPUT SETTINGS
 *--fullname*=<...>::
     This option is used to set the full suffix for the kernel and
     initrd/initramfs. It is appended to the kernel and initramfs with
-    a hyphen. This option defaults to  {kernname}-{arch}-{KV} where 
-    {kernname} is the --kernname setting, or "genkernel" if not set and
+    a hyphen. This option defaults to kernname-arch-KV where 
+    kernname is the --kernname setting, or "genkernel" if not set and
     KV is the version of the kernel from the kernel MAKEFILE with the 
     EXTRAVERSION from the kernel Makefile appended to it. 
    
@@ -371,7 +371,14 @@ OUTPUT SETTINGS
     Enable copying of firmware into initramfs.
 
 *--firmware-dir*=<dir>::
-    Specify directory to copy firmware from (defaults to '/lib/firmware').
+    Specify directory to copy firmware from (defaults to '/lib/firmware'). Deprecated.
+    Use --firmware-src instead.
+
+*--firmware-dst*=<dir>::
+   Specify directory to copy firmware to (defaults to '/lib/firmware').
+
+*--firmware-src*=<dir>::
+   Specify directory to copy firmware from. Defaults to the value of --firmware-dst.
 
 *--firmware-files*=<files>::
     Specifies specific firmware files to copy. This overrides *--firmware-dir*.
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index aa15dff..10388a7 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -47,7 +47,9 @@ longusage() {
   echo "				kernel and modules have been compiled"
   echo "	--static		Build a static (monolithic kernel)."
   echo "  Kernel settings"
-  echo "	--kerneldir=<dir>	Location of the kernel sources"
+  echo "        --build-src=<dir>       Location of kernel sources (default is --kerneldir)"
+  echo "        --build-dst=<dir>       Buid dir to use (default is --build-src)"
+  echo "	--kerneldir=<dir>	Location of the kernel sources (deprecated)"
   echo "	--kernel-config=<file>	Kernel configuration file to use for compilation"
   echo "	--module-prefix=<dir>	Prefix to kernel module destination, modules"
   echo "				will be installed in <prefix>/lib/modules"
@@ -103,9 +105,13 @@ longusage() {
   echo "	--tempdir=<dir>		Location of Genkernel's temporary directory"
   echo "	--postclear		Clear all tmp files and caches after genkernel has run"
   echo "  Output Settings"
+  echo "        --fullname=<...>        Tag the kernel and ramdisk with a name --"
+  echo "                                this replaces the full name after 'kernel-'"
+  echo "                                and 'initramfs-'. Defaults to:"
+  echo "                                (--kernname value)-ARCH-KV[-EXTRAVERSION]"
   echo "	--kernname=<...> 	Tag the kernel and ramdisk with a name:"
   echo "				If not defined the option defaults to"
-  echo "				'genkernel'"
+  echo "				'genkernel'. (deprecated)"
   echo "	--minkernpackage=<tbz2> File to output a .tar.bz2'd kernel and ramdisk:"
   echo "				No modules outside of the ramdisk will be"
   echo "				included..."
diff --git a/genkernel.8 b/genkernel.8
index 4955159..d957d77 100644
--- a/genkernel.8
+++ b/genkernel.8
@@ -2,12 +2,12 @@
 .\"     Title: genkernel
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.0 <http://docbook.sf.net/>
-.\"      Date: 05/23/2011
-.\"    Manual: genkernel 3.4.15-funtoo
-.\"    Source: genkernel 3.4.15-funtoo
+.\"      Date: 05/26/2011
+.\"    Manual: genkernel 3.4.15-r1-funtoo
+.\"    Source: genkernel 3.4.15-r1-funtoo
 .\"  Language: English
 .\"
-.TH "GENKERNEL" "8" "05/23/2011" "genkernel 3\&.4\&.15\-funtoo" "genkernel 3\&.4\&.15\-funtoo"
+.TH "GENKERNEL" "8" "05/26/2011" "genkernel 3\&.4\&.15\-r1\-funt" "genkernel 3\&.4\&.15\-r1\-funt"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -454,7 +454,7 @@ This option is used to change part of the suffix appended to the kernel and init
 .PP
 \fB\-\-fullname\fR=<\&...>
 .RS 4
-This option is used to set the full suffix for the kernel and initrd/initramfs\&. It is appended to the kernel and initramfs with KV is the version of the kernel from the kernel MAKEFILE with the EXTRAVERSION from the kernel Makefile appended to it\&.
+This option is used to set the full suffix for the kernel and initrd/initramfs\&. It is appended to the kernel and initramfs with a hyphen\&. This option defaults to kernname\-arch\-KV where kernname is the \-\-kernname setting, or "genkernel" if not set and KV is the version of the kernel from the kernel MAKEFILE with the EXTRAVERSION from the kernel Makefile appended to it\&.
 .RE
 .PP
 \fB\-\-minkernpackage\fR=<tbz2>
@@ -492,9 +492,20 @@ Enable copying of firmware into initramfs\&.
 \fB\-\-firmware\-dir\fR=<dir>
 .RS 4
 Specify directory to copy firmware from (defaults to
+\fI/lib/firmware\fR)\&. Deprecated\&. Use \-\-firmware\-src instead\&.
+.RE
+.PP
+\fB\-\-firmware\-dst\fR=<dir>
+.RS 4
+Specify directory to copy firmware to (defaults to
 \fI/lib/firmware\fR)\&.
 .RE
 .PP
+\fB\-\-firmware\-src\fR=<dir>
+.RS 4
+Specify directory to copy firmware from\&. Defaults to the value of \-\-firmware\-dst\&.
+.RE
+.PP
 \fB\-\-firmware\-files\fR=<files>
 .RS 4
 Specifies specific firmware files to copy\&. This overrides