Module Name: src
Committed By: christos
Date: Sat Apr 8 18:22:35 UTC 2017
Modified Files:
src: build.sh
Log Message:
- Allow all other targets (like kernel=) to obey mkrepro (-P)
- Print the timestamp in UTC
To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.315 src/build.sh:1.316
--- src/build.sh:1.315 Fri Mar 10 12:15:47 2017
+++ src/build.sh Sat Apr 8 14:22:35 2017
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.315 2017/03/10 17:15:47 sevan Exp $
+# $NetBSD: build.sh,v 1.316 2017/04/08 18:22:35 christos Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1893,7 +1893,7 @@ createmakewrapper()
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.315 2017/03/10 17:15:47 sevan Exp $
+# Generated from: \$NetBSD: build.sh,v 1.316 2017/04/08 18:22:35 christos Exp $
# with these arguments: ${_args}
#
@@ -2194,15 +2194,17 @@ setup_mkrepro()
if [ ${MKREPRO-no} != "yes" ]; then
return
fi
- buildtools
local dirs=${NETBSDSRCDIR-/usr/src}/
if [ ${MKX11-no} = "yes" ]; then
dirs="$dirs ${X11SRCDIR-/usr/xsrc}/"
fi
local cvslatest=$(print_tooldir_program cvslatest)
- MKREPRO_TIMESTAMP=$(${cvslatest} ${dirs})
+ if [ ! -x "${cvslatest}" ]; then
+ buildtools
+ fi
+ MKREPRO_TIMESTAMP=$("${cvslatest}" ${dirs})
[ -n "${MKREPRO_TIMESTAMP}" ] || bomb "Failed to compute timestamp"
- statusmsg2 "MKREPRO_TIMESTAMP" "$(date -r ${MKREPRO_TIMESTAMP})"
+ statusmsg2 "MKREPRO_TIMESTAMP" "$(TZ=UTC date -r ${MKREPRO_TIMESTAMP})"
export MKREPRO MKREPRO_TIMESTAMP
}
@@ -2236,6 +2238,7 @@ main()
rebuildmake
validatemakeparams
createmakewrapper
+ setup_mkrepro
# Perform the operations.
#
@@ -2259,7 +2262,6 @@ main()
;;
build|distribution|release)
- setup_mkrepro
${runcmd} "${makewrapper}" ${parallel} ${op} ||
bomb "Failed to make ${op}"
statusmsg "Successful make ${op}"
