commit:     ff96e4f3c6184ebd831e3718cdb4a7bfb13285ed
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 05:33:32 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:11:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ff96e4f3

Fix & unify "--help" output

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 56 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index d0e45be..9bdc157 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -22,26 +22,26 @@ longusage() {
   echo "       --logfile=<outfile>     Output file for debug info"
   echo "       --color                 Output debug in color"
   echo "       --no-color              Do not output debug in color"
-  echo "       --debug-cleanup Clean up temporary build directories on exit"
+  echo "       --debug-cleanup         Clean up temporary build directories on 
exit"
   echo "       --no-debug-cleanup      Do not remove any temporary directories 
on exit"
   echo "  Kernel Configuration settings"
   echo "       --menuconfig            Run menuconfig after oldconfig"
   echo "       --no-menuconfig         Do not run menuconfig after oldconfig"
   echo "       --nconfig               Run nconfig after oldconfig"
   echo "       --no-nconfig            Do not run nconfig after oldconfig"
-  echo "       --gconfig                       Run gconfig after oldconfig"
+  echo "       --gconfig               Run gconfig after oldconfig"
   echo "       --no-gconfig            Don't run gconfig after oldconfig"
-  echo "       --xconfig                       Run xconfig after oldconfig"
+  echo "       --xconfig               Run xconfig after oldconfig"
   echo "       --no-xconfig            Don't run xconfig after oldconfig"
   echo "       --save-config           Save the configuration to /etc/kernels"
   echo "       --no-save-config        Don't save the configuration to 
/etc/kernels"
-  echo "       --virtio                        Include VirtIO kernel code"
+  echo "       --virtio                Include VirtIO kernel code"
   echo "  Kernel Compile settings"
   echo "       --oldconfig             Implies --no-clean and runs a 'make 
oldconfig'"
   echo "       --clean                 Run make clean before compilation"
   echo "       --no-clean              Do not run make clean before 
compilation"
   echo "       --mrproper              Run make mrproper before compilation"
-  echo "       --no-mrproper   Do not run make mrproper before compilation"
+  echo "       --no-mrproper           Do not run make mrproper before 
compilation"
   echo "       --splash                Install framebuffer splash support into 
initramfs"
   echo "       --no-splash             Do not install framebuffer splash"
   echo "       --install               Install the kernel after building"
@@ -64,17 +64,20 @@ longusage() {
   echo "       --kernel-cc=<compiler>  Compiler to use for kernel (e.g. 
distcc)"
   echo "       --kernel-as=<assembler> Assembler to use for kernel"
   echo "       --kernel-ld=<linker>    Linker to use for kernel"
-  echo "       --kernel-cross-compile=<cross var> CROSS_COMPILE kernel 
variable"
+  echo "       --kernel-cross-compile=<cross var>"
+  echo "                               CROSS_COMPILE kernel variable"
   echo "       --kernel-make=<makeprg> GNU Make to use for kernel"
   echo "       --kernel-target=<t>     Override default make target (bzImage)"
   echo "       --kernel-binary=<path>  Override default kernel binary path 
(arch/foo/boot/bar)"
-  echo "       --kernel-outputdir=<path> Save output files outside the source 
tree."
+  echo "       --kernel-outputdir=<path>"
+  echo "                               Save output files outside the source 
tree."
 
   echo "       --utils-cc=<compiler>   Compiler to use for utilities"
   echo "       --utils-as=<assembler>  Assembler to use for utils"
   echo "       --utils-ld=<linker>     Linker to use for utils"
   echo "       --utils-make=<makeprog> GNU Make to use for utils"
-  echo "       --utils-cross-compile=<cross var> CROSS_COMPILE utils variable"
+  echo "       --utils-cross-compile=<cross var>"
+  echo "                               CROSS_COMPILE utils variable"
   echo "       --utils-arch=<arch>     Force to arch for utils only instead of"
   echo "                               autodetect."
   echo "       --makeopts=<makeopts>   Make options such as -j2, etc..."
@@ -99,7 +102,7 @@ longusage() {
   echo "       --no-mdadm              Exclude MDADM/MDMON support"
   echo "       --mdadm-config=<file>   Use file as mdadm.conf in initramfs"
   echo "       --microcode[=<type>]    Include early microcode support, for 
'all'/'amd'/'intel' CPU types"
-  echo "       --no-microcode                  Exclude early microcode support"
+  echo "       --no-microcode          Exclude early microcode support"
   echo "       --microcode-initramfs   Include early microcode in initramfs"
   echo "       --nfs                   Include NFS support"
   echo "       --no-nfs                Exclude NFS support"
@@ -107,12 +110,12 @@ longusage() {
   echo "       --no-dmraid             Exclude DMRAID support"
   echo "       --e2fsprogs             Include e2fsprogs"
   echo "       --no-e2fsprogs          Exclude e2fsprogs"
-  echo "       --zfs                   Include ZFS support (enabled by default 
if rootfs is zfs)"
+  echo "       --zfs                   Include ZFS support (enabled by default 
if rootfs is ZFS)"
   echo "       --no-zfs                Exclude ZFS support"
-  echo "       --btrfs                 Include Btrfs support (enabled by 
default if rootfs is btrfs)"
+  echo "       --btrfs                 Include Btrfs support (enabled by 
default if rootfs is Btrfs)"
   echo "       --no-btrfs              Exclude Btrfs support"
   echo "       --multipath             Include Multipath support"
-  echo "       --no-multipath  Exclude Multipath support"
+  echo "       --no-multipath          Exclude Multipath support"
   echo "       --iscsi                 Include iSCSI support"
   echo "       --no-iscsi              Exclude iSCSI support"
   echo "       --hyperv                Include Microsoft Hyper-V support"
@@ -126,18 +129,18 @@ longusage() {
   echo "       --busybox-config=<file> Specifies a user created busybox config"
   echo "       --genzimage             Make and install kernelz image 
(PowerPC)"
   echo "       --disklabel             Include disk label and uuid support in 
your ramdisk"
-  echo "       --no-disklabel  Exclude disk label and uuid support in your 
ramdisk"
+  echo "       --no-disklabel          Exclude disk label and uuid support in 
your ramdisk"
   echo "       --luks                  Include LUKS support"
   echo "                               --> 'emerge cryptsetup' with USE=static"
   echo "       --no-luks               Exclude LUKS support"
   echo "       --gpg                   Include GPG-armored LUKS key support"
   echo "       --no-gpg                Exclude GPG-armored LUKS key support"
   echo "       --busybox               Include busybox"
-  echo "       --no-busybox    Exclude busybox"
+  echo "       --no-busybox            Exclude busybox"
   echo "       --unionfs               Include support for unionfs"
-  echo "       --no-unionfs    Exclude support for unionfs"
+  echo "       --no-unionfs            Exclude support for unionfs"
   echo "       --netboot               Create a self-contained env in the 
initramfs"
-  echo "       --no-netboot    Exclude --netboot env"
+  echo "       --no-netboot            Exclude netboot env"
   echo "       --real-root=<foo>       Specify a default for real_root="
   echo "  Internals"
   echo "       --arch-override=<arch>  Force to arch instead of autodetect"
@@ -147,18 +150,18 @@ longusage() {
   echo "                               like BusyBox, DMRAID, GnuPG, LVM, MDADM 
..."
   echo "       --no-clear-cachedir     Do not clean up on genkernel start"
   echo "       --tempdir=<dir>         Location of genkernel's temporary 
directory"
-  echo "       --postclear                     Clear all tmp files and caches 
after genkernel has run"
+  echo "       --postclear             Clear all tmp files and caches after 
genkernel has run"
   echo "       --no-postclear          Do not clean up after genkernel has run"
   echo "  Output Settings"
-  echo "       --kernname=<...>        Tag the kernel and ramdisk with a name:"
+  echo "       --kernname=<...>        Tag the kernel and ramdisk with a name:"
   echo "                               If not defined the option defaults to"
   echo "                               'genkernel'"
-  echo "       --minkernpackage=<tbz2> File to output a .tar.bz2'd kernel and 
ramdisk:"
+  echo "       --minkernpackage=<tbz2> File to output a .tar.bz2'd kernel and 
ramdisk:"
   echo "                               No modules outside of the ramdisk will 
be"
   echo "                               included..."
-  echo "       --modulespackage=<tbz2> File to output a .tar.bz2'd modules 
after the"
+  echo "       --modulespackage=<tbz2> File to output a .tar.bz2'd modules 
after the"
   echo "                               callbacks have run"
-  echo "       --kerncache=<tbz2>      File to output a .tar.bz2'd kernel 
contents"
+  echo "       --kerncache=<tbz2>      File to output a .tar.bz2'd kernel 
contents"
   echo "                               of /lib/modules/ and the kernel config"
   echo "                               NOTE: This is created before the 
callbacks"
   echo "                               are run!"
@@ -168,8 +171,7 @@ longusage() {
   echo "       --initramfs-overlay=<dir>"
   echo "                               Directory structure to include in the 
initramfs,"
   echo "                               only available on 2.6 kernels"
-  echo "       --firmware"
-  echo "                               Enable copying of firmware into 
initramfs"
+  echo "       --firmware              Enable copying of firmware into 
initramfs"
   echo "       --firmware-dir=<dir>"
   echo "                               Specify directory to copy firmware from 
(defaults"
   echo "                               to /lib/firmware)"
@@ -177,8 +179,7 @@ longusage() {
   echo "                               Specifies specific firmware files to 
copy. This"
   echo "                               overrides --firmware-dir. For multiple 
files,"
   echo "                               separate the filenames with a comma"
-  echo "       --firmware-install"
-  echo "                               Enable installing firmware onto root 
filesystem"
+  echo "       --firmware-install      Enable installing firmware onto root 
filesystem"
   echo "                               (only available for kernels older than 
v4.14)"
   echo "       --integrated-initramfs, --no-integrated-initramfs"
   echo "                               Include/exclude the generated initramfs 
in the kernel"
@@ -193,8 +194,7 @@ longusage() {
   echo "       --strip=(all|kernel|modules|none)"
   echo "                               Strip debug symbols from none, all, 
installed kernel (obsolete) or"
   echo "                               modules (default)."
-  echo "       --no-strip"
-  echo "                               Don't strip installed kernel or 
modules, alias for --strip=none"
+  echo "       --no-strip              Don't strip installed kernel or 
modules, alias for --strip=none"
   echo
   echo "For a detailed list of supported initramfs options and flags; issue:"
   echo "       man 8 genkernel"
@@ -204,7 +204,7 @@ usage() {
   echo "Gentoo Linux Genkernel ${GK_V}"
   echo
   echo "Usage: "
-  echo "       genkernel [options] all"
+  echo "       genkernel [options] (all|bzImage|initramfs|kernel)"
   echo
   echo 'Some useful options:'
   echo '       --menuconfig            Run menuconfig after oldconfig'

Reply via email to