Module Name: src
Committed By: gutteridge
Date: Tue May 21 04:01:26 UTC 2024
Modified Files:
src/usr.bin/mkubootimage: mkubootimage.1 mkubootimage.c
Log Message:
mkubootimage(1): adjust usage, etc.
In the tool, reflow and reorder usage() output and also consistently
mark which arguments are optional.
In the man page, add missing -t argument in the synopsis and follow
consistent argument ordering.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/mkubootimage/mkubootimage.1
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/mkubootimage/mkubootimage.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mkubootimage/mkubootimage.1
diff -u src/usr.bin/mkubootimage/mkubootimage.1:1.16 src/usr.bin/mkubootimage/mkubootimage.1:1.17
--- src/usr.bin/mkubootimage/mkubootimage.1:1.16 Tue May 21 03:54:31 2024
+++ src/usr.bin/mkubootimage/mkubootimage.1 Tue May 21 04:01:26 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: mkubootimage.1,v 1.16 2024/05/21 03:54:31 gutteridge Exp $
+.\" $NetBSD: mkubootimage.1,v 1.17 2024/05/21 04:01:26 gutteridge Exp $
.\"
.\" Copyright (c) 2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -46,6 +46,7 @@
.Fl n Ar image
.Op Fl O Po freebsd Ns | Ns linux Ns | Ns netbsd Ns | Ns openbsd Pc
.Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns script Ns | Ns standalone )
+.Op Fl t Ar epoch
.Ar source destination
.\"
.Sh DESCRIPTION
@@ -119,14 +120,14 @@ This is required.
Defines the operating system type.
The default OS name is
.Qq netbsd .
-.It Fl t Ar epoch
-Use given epoch timestamp as image creation time.
-(This is only used for legacy U-Boot images.)
.It Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns script Ns | Ns standalone )
Defines the image type.
This is required for
.Qq uimg
format images.
+.It Fl t Ar epoch
+Use given epoch timestamp as image creation time.
+(This is only used for legacy U-Boot images.)
.It Fl u
Update the header in an existing file instead of creating a new one.
.El
Index: src/usr.bin/mkubootimage/mkubootimage.c
diff -u src/usr.bin/mkubootimage/mkubootimage.c:1.32 src/usr.bin/mkubootimage/mkubootimage.c:1.33
--- src/usr.bin/mkubootimage/mkubootimage.c:1.32 Tue May 21 03:54:31 2024
+++ src/usr.bin/mkubootimage/mkubootimage.c Tue May 21 04:01:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.32 2024/05/21 03:54:31 gutteridge Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.33 2024/05/21 04:01:26 gutteridge Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mkubootimage.c,v 1.32 2024/05/21 03:54:31 gutteridge Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.33 2024/05/21 04:01:26 gutteridge Exp $");
#include <sys/mman.h>
#include <sys/stat.h>
@@ -264,10 +264,10 @@ __dead static void
usage(void)
{
fprintf(stderr,
-"Usage: %s [-hu] -A <arm|arm64|i386|mips|mips64|or1k|powerpc|riscv|sh> -a address\n"
-"\t-C <bz2|gz|lzma|lzo|none> [-E address] [-e address] [-t timestamp]\n"
-"\t[-f <arm64|uimg>] [-m magic] -n image -O <freebsd|linux|netbsd|openbsd>\n"
-"\t-T <fs|kernel|kernel_noload|ramdisk|script|standalone>\n"
+"Usage: %s [-hu] -A <arm|arm64|i386|mips|mips64|or1k|powerpc|riscv|sh>\n"
+"\t-a address [-C <bz2|gz|lzma|lzo|none>] [-E address] [-e address] \n"
+"\t[-f <arm64|uimg>] [-m magic] -n image [-O <freebsd|linux|netbsd|openbsd>]\n"
+"\t-T <fs|kernel|kernel_noload|ramdisk|script|standalone> [-t timestamp]\n"
"\tsource destination\n", getprogname());
exit(EXIT_FAILURE);
