[src/trunk]: src - Allow all other targets (like kernel=) to obey mkrepro (-P)

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fe4448c29298
branches:  trunk
changeset: 822822:fe4448c29298
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 08 18:22:35 2017 +0000

description:
- Allow all other targets (like kernel=) to obey mkrepro (-P)
- Print the timestamp in UTC

diffstat:

 build.sh |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r 7980c3ca503f -r fe4448c29298 build.sh
--- a/build.sh  Sat Apr 08 18:10:43 2017 +0000
+++ b/build.sh  Sat Apr 08 18:22:35 2017 +0000
@@ -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 @@
        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 @@
        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 @@
        rebuildmake
        validatemakeparams
        createmakewrapper
+       setup_mkrepro
 
        # Perform the operations.
        #
@@ -2259,7 +2262,6 @@
                        ;;
 
                build|distribution|release)
-                       setup_mkrepro
                        ${runcmd} "${makewrapper}" ${parallel} ${op} ||
                            bomb "Failed to make ${op}"
                        statusmsg "Successful make ${op}"