[gentoo-commits] proj/genkernel:master commit in: /, doc/

[Matt Turner]

commit:     0fb54668df8925cd81ed9d40917c19a78891f9da
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 13 05:07:05 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 13 05:07:05 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0fb54668

gen_cmdline.sh: Correctly sort --{kernel,utils}-{as,nm}

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 doc/genkernel.8.txt | 18 +++++++++---------
 gen_cmdline.sh      | 40 ++++++++++++++++++++--------------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 262027b..273f9c1 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -243,24 +243,24 @@ LOW-LEVEL COMPILATION OPTIONS
     when the system running genkernel has a different architecture like
     the system which should boot the created kernel/initramfs.
 
-*--kernel-as*=<assembler>::
-    Assembler to use for the kernel compilation.
-
 *--kernel-ar*=<archiver>::
     Archiver to use for the kernel compilation.
 
+*--kernel-as*=<assembler>::
+    Assembler to use for the kernel compilation.
+
 *--kernel-cc*=<compiler>::
     Compiler to use for the kernel compilation (e.g. distcc).
 
 *--kernel-ld*=<linker>::
     Linker to use for the kernel compilation.
 
-*--kernel-nm*=<nm>::
-    NM utility to use for the kernel compilation.
-
 *--kernel-make*=<makeprog>::
     GNU Make to use for the kernel compilation.
 
+*--kernel-nm*=<nm>::
+    NM utility to use for the kernel compilation.
+
 *--kernel-objcopy*=<objcopyprog>::
     Objcopy utility to use for the kernel compilation.
 
@@ -290,12 +290,12 @@ LOW-LEVEL COMPILATION OPTIONS
     tree (eg because cannot write to that directory as the user genkernel is
     running as).
 
-*--utils-as*=<assembler>::
-    Assembler to use for utilities.
-
 *--utils-ar*=<archiver>::
     Archiver to use for utilities.
 
+*--utils-as*=<assembler>::
+    Assembler to use for utilities.
+
 *--utils-cflags*=<cflags>::
     C compiler flags used to compile utilities.
 

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index b35750d..e3c985e 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -86,24 +86,24 @@ longusage() {
   echo "  Low-Level Compile settings"
   echo "	--cross-compile=<target-triplet>"
   echo "				Target triple (i.e. aarch64-linux-gnu) to build for"
-  echo "	--kernel-as=<assembler>	Assembler to use for kernel"
   echo "	--kernel-ar=<archiver>	Archiver to use for kernel"
+  echo "	--kernel-as=<assembler>	Assembler to use for kernel"
   echo "	--kernel-cc=<compiler>	Compiler to use for kernel (e.g. distcc)"
   echo "	--kernel-ld=<linker>	Linker to use for kernel"
-  echo "	--kernel-nm=<nm>	NM utility to use for kernel"
   echo "	--kernel-make=<makeprg> GNU Make to use for kernel"
+  echo "	--kernel-nm=<nm>	NM utility 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>"
   echo "				Save output files outside the source tree"
-  echo "	--utils-as=<assembler>	Assembler to use for utils"
   echo "	--utils-ar=<archiver>	Archiver to use for utils"
+  echo "	--utils-as=<assembler>	Assembler to use for utils"
   echo "	--utils-cc=<compiler>	C Compiler to use for utilities"
   echo "	--utils-cxx=<compiler>	C++ Compiler to use for utilities"
   echo "	--utils-cflags=<cflags> C compiler flags used to compile utilities"
   echo "	--utils-ld=<linker>	Linker to use for utils"
-  echo "	--utils-nm=<nm>		NM utility to use for utils"
   echo "	--utils-make=<makeprog>	GNU Make to use for utils"
+  echo "	--utils-nm=<nm>		NM utility to use for utils"
   echo "	--makeopts=<makeopts>	Make options such as -j2, etc ..."
   echo "	--mountboot		Mount BOOTDIR automatically if mountable"
   echo "	--no-mountboot		Don't mount BOOTDIR automatically"
@@ -292,14 +292,14 @@ parse_cmdline() {
 			CMD_CROSS_COMPILE="${*#*=}"
 			print_info 3 "CMD_CROSS_COMPILE: ${CMD_CROSS_COMPILE}"
 			;;
-		--kernel-as=*)
-			CMD_KERNEL_AS="${*#*=}"
-			print_info 3 "CMD_KERNEL_AS: ${CMD_KERNEL_AS}"
-			;;
 		--kernel-ar=*)
 			CMD_KERNEL_AR="${*#*=}"
 			print_info 3 "CMD_KERNEL_AR: ${CMD_KERNEL_AR}"
 			;;
+		--kernel-as=*)
+			CMD_KERNEL_AS="${*#*=}"
+			print_info 3 "CMD_KERNEL_AS: ${CMD_KERNEL_AS}"
+			;;
 		--kernel-cc=*)
 			CMD_KERNEL_CC="${*#*=}"
 			print_info 3 "CMD_KERNEL_CC: ${CMD_KERNEL_CC}"
@@ -308,14 +308,14 @@ parse_cmdline() {
 			CMD_KERNEL_LD="${*#*=}"
 			print_info 3 "CMD_KERNEL_LD: ${CMD_KERNEL_LD}"
 			;;
-		--kernel-nm=*)
-			CMD_KERNEL_NM="${*#*=}"
-			print_info 3 "CMD_KERNEL_NM: ${CMD_KERNEL_NM}"
-			;;
 		--kernel-make=*)
 			CMD_KERNEL_MAKE="${*#*=}"
 			print_info 3 "CMD_KERNEL_MAKE: ${CMD_KERNEL_MAKE}"
 			;;
+		--kernel-nm=*)
+			CMD_KERNEL_NM="${*#*=}"
+			print_info 3 "CMD_KERNEL_NM: ${CMD_KERNEL_NM}"
+			;;
 		--kernel-objcopy=*)
 			CMD_KERNEL_OBJCOPY="${*#*=}"
 			print_info 3 "CMD_KERNEL_OBJCOPY: ${CMD_KERNEL_OBJCOPY}"
@@ -348,14 +348,14 @@ parse_cmdline() {
 			CMD_KERNEL_OUTPUTDIR="${*#*=}"
 			print_info 3 "CMD_KERNEL_OUTPUTDIR: ${CMD_KERNEL_OUTPUTDIR}"
 			;;
-		--utils-as=*)
-			CMD_UTILS_AS="${*#*=}"
-			print_info 3 "CMD_UTILS_AS: ${CMD_UTILS_AS}"
-			;;
 		--utils-ar=*)
 			CMD_UTILS_AR="${*#*=}"
 			print_info 3 "CMD_UTILS_AR: ${CMD_UTILS_AR}"
 			;;
+		--utils-as=*)
+			CMD_UTILS_AS="${*#*=}"
+			print_info 3 "CMD_UTILS_AS: ${CMD_UTILS_AS}"
+			;;
 		--utils-cc=*)
 			CMD_UTILS_CC="${*#*=}"
 			print_info 3 "CMD_UTILS_CC: ${CMD_UTILS_CC}"
@@ -372,14 +372,14 @@ parse_cmdline() {
 			CMD_UTILS_LD="${*#*=}"
 			print_info 3 "CMD_UTILS_LD: ${CMD_UTILS_LD}"
 			;;
-		--utils-nm=*)
-			CMD_UTILS_NM="${*#*=}"
-			print_info 3 "CMD_UTILS_NM: ${CMD_UTILS_NM}"
-			;;
 		--utils-make=*)
 			CMD_UTILS_MAKE="${*#*=}"
 			print_info 3 "CMD_UTILS_MAKE: ${CMD_UTILS_MAKE}"
 			;;
+		--utils-nm=*)
+			CMD_UTILS_NM="${*#*=}"
+			print_info 3 "CMD_UTILS_NM: ${CMD_UTILS_NM}"
+			;;
 		--utils-objcopy=*)
 			CMD_UTILS_OBJCOPY="${*#*=}"
 			print_info 3 "CMD_UTILS_OBJCOPY: ${CMD_UTILS_OBJCOPY}"