 @@ -1,15 +1,15 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.355 2021/08/29 09:02:01 christos Exp $
+#	$NetBSD: build.sh,v 1.356 2021/09/09 15:00:01 martin Exp $
+#
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Todd Vierling and Luke Mewburn.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -1061,26 +1061,28 @@ Usage: ${progname} [-EhnoPRrUuxy] [-a ar
                         RELEASEDIR/RELEASEMACHINEDIR/binary/syspkgs.
     iso-image           Create CD-ROM image in RELEASEDIR/images.
     iso-image-source    Create CD-ROM image with source in RELEASEDIR/images.
     live-image          Create bootable live image in
                         RELEASEDIR/RELEASEMACHINEDIR/installation/liveimage.
     install-image       Create bootable installation image in
                         RELEASEDIR/RELEASEMACHINEDIR/installation/installimage.
     disk-image=target   Create bootable disk image in
                         RELEASEDIR/RELEASEMACHINEDIR/binary/gzimg/target.img.gz.
     params              Display various make(1) parameters.
     list-arch           Display a list of valid MACHINE/MACHINE_ARCH values,
                         and exit.  The list may be narrowed by passing glob
                         patterns or exact values in MACHINE or MACHINE_ARCH.
     mkrepro-timestamp   Show the latest source timestamp used for reproducable
                         builds and exit.  Requires -P or -V MKREPRO=yes.
  Options:
     -a arch        Set MACHINE_ARCH to arch.  [Default: deduced from MACHINE]
     -B buildid     Set BUILDID to buildid.
     -C cdextras    Append cdextras to CDEXTRA variable for inclusion on CD-ROM.
     -c compiler    Select compiler:
                        clang
                        gcc
                    [Default: gcc]
     -D dest        Set DESTDIR to dest.  [Default: destdir.MACHINE]
     -E             Set "expert" mode; disables various safety checks.
                    Should not be used without expert knowledge of the build
                    system.
 @@ -1356,27 +1358,32 @@ parseoptions()
 	eval ${optremcmd}
 	while [ $# -gt 0 ]; do
 		op=$1; shift
 		operations="${operations} ${op}"
 		case "${op}" in
 		help)
 			usage
 			;;
 		list-arch)
 			listarch "${MACHINE}" "${MACHINE_ARCH}"
-			exit $?
+			exit
 			;;
 		mkrepro-timestamp)
 			setup_mkrepro quiet
 			echo ${MKREPRO_TIMESTAMP:-0}
 			[ ${MKREPRO_TIMESTAMP:-0} -ne 0 ]; exit
 			;;
 		kernel=*|releasekernel=*|kernel.gdb=*)
 			arg=${op#*=}
 			op=${op%%=*}
 			[ -n "${arg}" ] ||
 			    bomb "Must supply a kernel name with \`${op}=...'"
 			;;
 		disk-image=*)
 			arg=${op#*=}
 			op=disk_image
 			[ -n "${arg}" ] ||
 @@ -1955,27 +1962,27 @@ createmakewrapper()
 	else
 		makewrapout=">>\${makewrapper}"
 	fi
 	case "${KSH_VERSION:-${SH_VERSION}}" in
 	*PD\ KSH*|*MIRBSD\ KSH*)
 		set +o braceexpand
 		;;
 	esac
 	eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.355 2021/08/29 09:02:01 christos Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.356 2021/09/09 15:00:01 martin Exp $
 # with these arguments: ${_args}
+#
 EOF
+	{
 		sorted_vars="$(for var in ${makeenv}; do echo "${var}" ; done \
 			| sort -u )"
 		for var in ${sorted_vars}; do
 			eval val=\"\${${var}}\"
 			eval is_set=\"\${${var}+set}\"
 			if [ -z "${is_set}" ]; then
 				echo "unset ${var}"
 			else
 @@ -2284,29 +2291,34 @@ dorump()
 			}'
 		[ $? -ne 0 ] && bomb "Testlink of rump failed: ${set}"
 	done
 	statusmsg "Rump build&link tests successful"
+}
 repro_date() {
 	# try the bsd date fail back the the linux one
 	date -u -r "$1" 2> /dev/null || date -u -d "@$1"
+}
 setup_mkrepro()
+{
 	local quiet="$1"
 	if [ ${MKREPRO-no} != "yes" ]; then
 		return
 	fi
 	if [ ${MKREPRO_TIMESTAMP-0} -ne 0 ]; then
 		return;
 	fi
 	local dirs=${NETBSDSRCDIR-/usr/src}/
 	if [ ${MKX11-no} = "yes" ]; then
 		dirs="$dirs ${X11SRCDIR-/usr/xsrc}/"
 	fi
 	local cvslatest=$(print_tooldir_program cvslatest)
 	if [ ! -x "${cvslatest}" ]; then
 		buildtools
 	fi
 	local cvslatestflags=
 	if ${do_expertmode}; then
 @@ -2333,27 +2345,30 @@ setup_mkrepro()
 		fi
 		if [ -z "$t" ]; then
 			bomb "Failed to get timestamp for vcs=$vcs in '$d'"
 		fi
 		#echo "latest $d $vcs $t"
 		if [ "$t" -gt "$MKREPRO_TIMESTAMP" ]; then
 			MKREPRO_TIMESTAMP="$t"
 		fi
 	done
 	[ "${MKREPRO_TIMESTAMP}" != "0" ] || bomb "Failed to compute timestamp"
-	statusmsg2 "MKREPRO_TIMESTAMP" "$(repro_date "${MKREPRO_TIMESTAMP}")"
+	if [ -z "${quiet}" ]; then
 		statusmsg2 "MKREPRO_TIMESTAMP" \
 			"$(repro_date "${MKREPRO_TIMESTAMP}")"
 	fi
 	export MKREPRO MKREPRO_TIMESTAMP
+}
 main()
+{
 	initdefaults
 	_args=$@
 	parseoptions "$@"
 	sanitycheck
 	build_start=$(date)
 	statusmsg2 "${progname} command:" "$0 $*"