diff options
| author | apb <apb@NetBSD.org> | 2014-08-03 09:22:29 +0000 |
|---|---|---|
| committer | apb <apb@NetBSD.org> | 2014-08-03 09:22:29 +0000 |
| commit | a6c7e1c4fdb28de7cc7f0bdf2ae4543f8602edac (patch) | |
| tree | ac0813f02a45708c0a2b5e7db1949a9c22165c46 | |
| parent | 1e991c0d3f4b04faa301b3e652ea5d8259a36b59 (diff) | |
BUILDINFO part 4: build.sh
Add BUILDINFO to the list of variables saved in the makewrapper script,
and print any non-blank BUILDINFO lines near the beginning of the output
from build.sh.
Index: build.sh
===================================================================
RCS file: /cvsroot/src/build.sh,v
retrieving revision 1.286
diff -d -p -u -r1.286 build.sh
--- build.sh 3 Aug 2014 01:03:41 -0000 1.286
+++ build.sh 3 Aug 2014 09:20:46 -0000
@@ -1299,6 +1299,7 @@ parseoptions()
#
makeenv="${makeenv} TOOLDIR MACHINE MACHINE_ARCH MAKEFLAGS"
[ -z "${BUILDID}" ] || makeenv="${makeenv} BUILDID"
+ [ -z "${BUILDINFO}" ] || makeenv="${makeenv} BUILDINFO"
MAKEFLAGS="-de -m ${TOP}/share/mk ${MAKEFLAGS}"
MAKEFLAGS="${MAKEFLAGS} MKOBJDIRS=${MKOBJDIRS-yes}"
export MAKEFLAGS MACHINE MACHINE_ARCH
@@ -2078,6 +2079,13 @@ main()
if [ -n "${BUILDID}" ]; then
statusmsg2 "BUILDID:" "${BUILDID}"
fi
+ if [ -n "${BUILDINFO}" ]; then
+ printf "%b\n" "${BUILDINFO}" | \
+ while read -r line ; do
+ [ -s "${line}" ] && continue
+ statusmsg2 "BUILDINFO:" "${line}"
+ done
+ fi
rebuildmake
validatemakeparams
| -rwxr-xr-x | build.sh | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.286 2014/08/03 01:03:41 riz Exp $ +# $NetBSD: build.sh,v 1.287 2014/08/03 09:22:29 apb Exp $ # # Copyright (c) 2001-2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -1299,6 +1299,7 @@ parseoptions() # makeenv="${makeenv} TOOLDIR MACHINE MACHINE_ARCH MAKEFLAGS" [ -z "${BUILDID}" ] || makeenv="${makeenv} BUILDID" + [ -z "${BUILDINFO}" ] || makeenv="${makeenv} BUILDINFO" MAKEFLAGS="-de -m ${TOP}/share/mk ${MAKEFLAGS}" MAKEFLAGS="${MAKEFLAGS} MKOBJDIRS=${MKOBJDIRS-yes}" export MAKEFLAGS MACHINE MACHINE_ARCH @@ -1774,7 +1775,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.286 2014/08/03 01:03:41 riz Exp $ +# Generated from: \$NetBSD: build.sh,v 1.287 2014/08/03 09:22:29 apb Exp $ # with these arguments: ${_args} # @@ -2078,6 +2079,13 @@ main() if [ -n "${BUILDID}" ]; then statusmsg2 "BUILDID:" "${BUILDID}" fi + if [ -n "${BUILDINFO}" ]; then + printf "%b\n" "${BUILDINFO}" | \ + while read -r line ; do + [ -s "${line}" ] && continue + statusmsg2 "BUILDINFO:" "${line}" + done + fi rebuildmake validatemakeparams |
