Sat Jun 10 14:11:08 2023 UTC ()
maketars: add comments for skipped mtree keywords

Reorder skipkeys alphabetically and add comment explaining
the purpose and why sha256 is not part of the variable.


(lukem)
diff -r1.94 -r1.95 src/distrib/sets/maketars
cvs diff -r1.94 -r1.95 src/distrib/sets/maketars (expand / switch to unified diff)

--- src/distrib/sets/maketars 2022/08/21 07:10:03 1.94
+++ src/distrib/sets/maketars 2023/06/10 14:11:08 1.95
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $NetBSD: maketars,v 1.94 2022/08/21 07:10:03 lukem Exp $ 3# $NetBSD: maketars,v 1.95 2023/06/10 14:11:08 lukem Exp $
4# 4#
5# Make release tar files for some or all lists. Usage: 5# Make release tar files for some or all lists. Usage:
6# maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir] 6# maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
7# [-M metalog] [-N etcdir] [-F setlistsdir] [-d destdir] 7# [-M metalog] [-N etcdir] [-F setlistsdir] [-d destdir]
8# [-t tardir] [-U] [setname ...] 8# [-t tardir] [-U] [setname ...]
9# 9#
10# The default sets are "base comp debug dtb etc games gpufw man misc rescue tests text" 10# The default sets are "base comp debug dtb etc games gpufw man misc rescue tests text"
11# The X sets are "xbase xcomp xdebug xetc xfont xserver" 11# The X sets are "xbase xcomp xdebug xetc xfont xserver"
12# 12#
13# If '-i installdir' is given, copy the given sets to installdir 13# If '-i installdir' is given, copy the given sets to installdir
14# (using pax -rw ...) instead of creating tar files. 14# (using pax -rw ...) instead of creating tar files.
15# In this case, remove "etc", and "xetc" from the list of default sets. 15# In this case, remove "etc", and "xetc" from the list of default sets.
16# 16#
@@ -20,29 +20,32 @@ rundir="$(dirname "$0")" # ${0%/*} isn't @@ -20,29 +20,32 @@ rundir="$(dirname "$0")" # ${0%/*} isn't
20. "${rundir}/sets.subr" 20. "${rundir}/sets.subr"
21 21
22# set defaults 22# set defaults
23lists= 23lists=
24tars="${RELEASEDIR}" 24tars="${RELEASEDIR}"
25dest="${DESTDIR}" 25dest="${DESTDIR}"
26metalog= 26metalog=
27installdir= 27installdir=
28etcdir= 28etcdir=
29setlistdir= 29setlistdir=
30timestamp= 30timestamp=
31setfilesonly=false 31setfilesonly=false
32quiet=false 32quiet=false
33skipkeys=time,md5,sha1,sha384,sha512,rmd160,cksum 
34preserve="-pe" 33preserve="-pe"
35 34
 35# mtree(8) keys to skip (exclude) in the generated /etc/mtree/sets.* files.
 36# Note: sets contain sha256 so that keyword is not listed here.
 37skipkeys=cksum,md5,rmd160,sha1,sha384,sha512,time
 38
36usage() 39usage()
37{ 40{
38 cat 1>&2 <<USAGE 41 cat 1>&2 <<USAGE
39Usage: ${prog} [-L base,x] [-b] [-x] [-i idir] [-a arch] [-m machine] 42Usage: ${prog} [-L base,x] [-b] [-x] [-i idir] [-a arch] [-m machine]
40 [-s setsdir] [-S] [-M metalog] [-N etcdir] [-F setlistdir] 43 [-s setsdir] [-S] [-M metalog] [-N etcdir] [-F setlistdir]
41 [-d dest] [-t targetdir] [setname ...] 44 [-d dest] [-t targetdir] [setname ...]
42 -L base,x Make specified lists 45 -L base,x Make specified lists
43 -b Make both netbsd and x11 lists 46 -b Make both netbsd and x11 lists
44 -x Only make x11 lists 47 -x Only make x11 lists
45 [Default: make netbsd lists] 48 [Default: make netbsd lists]
46 -i idir Install sets to idir instead of creating tar files 49 -i idir Install sets to idir instead of creating tar files
47 -a arch Set arch (e.g, m68k, mipseb, mipsel, powerpc) [${MACHINE_ARCH}] 50 -a arch Set arch (e.g, m68k, mipseb, mipsel, powerpc) [${MACHINE_ARCH}]
48 -m machine Set machine (e.g, amiga, i386, macppc) [${MACHINE}] 51 -m machine Set machine (e.g, amiga, i386, macppc) [${MACHINE}]