Module Name: src
Committed By: apb
Date: Sun Aug 3 09:19:34 UTC 2014
Modified Files:
src/etc: Makefile Makefile.params
Log Message:
BUILDINFO part 3: Add BUILDINFO to RELEASEVARS and /etc/release
The BUILDINFO string will appear nearthe top of /etc/release,
indented by 8 spaces and with a blank line above and below it,
but without a heading. The BUILDINFO string is expected to
be self-explanatory.
Also change some other headings near the top of /etc/release.
To generate a diff of this commit:
cvs rdiff -u -r1.415 -r1.416 src/etc/Makefile
cvs rdiff -u -r1.11 -r1.12 src/etc/Makefile.params
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.415 src/etc/Makefile:1.416
--- src/etc/Makefile:1.415 Mon Jun 30 15:34:57 2014
+++ src/etc/Makefile Sun Aug 3 09:19:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.415 2014/06/30 15:34:57 martin Exp $
+# $NetBSD: Makefile,v 1.416 2014/08/03 09:19:34 apb Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -193,13 +193,21 @@ etc-release: .EXEC .MAKE
echo ; \
cat ${NETBSDSRCDIR}/sys/conf/copyright; \
echo ; \
- echo "Build settings:"; \
+ echo "Build information:"; \
printf "%20s %s\n" "Build date" "$$(date -u)"; \
printf "%20s %s\n" "Built by" "$${USER-root}@$$(hostname)"; \
if [ -n "${BUILDID}" ]; then \
- printf "%20s %s\n" "Build ID:" "${BUILDID}" ; \
+ printf "%20s %s\n" "Build ID" "${BUILDID}" ; \
+ fi ; \
+ if [ -n "${BUILDINFO}" ]; then \
+ echo ; \
+ info="$$(printf "%b" ${BUILDINFO:Q})" ; \
+ printf "%s\n" "$${info}" \
+ | ${TOOL_SED} -e 's/^/ /' ; \
fi ; \
echo ; \
+ echo "Build settings:"; \
+ echo ; \
${PRINT_PARAMS} ; \
) >${.OBJDIR}/${.TARGET}
Index: src/etc/Makefile.params
diff -u src/etc/Makefile.params:1.11 src/etc/Makefile.params:1.12
--- src/etc/Makefile.params:1.11 Tue Mar 25 09:52:55 2014
+++ src/etc/Makefile.params Sun Aug 3 09:19:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.params,v 1.11 2014/03/25 09:52:55 ozaki-r Exp $
+# $NetBSD: Makefile.params,v 1.12 2014/08/03 09:19:34 apb Exp $
#
# Makefile fragment for printing build parameters.
#
@@ -37,7 +37,7 @@
.include <bsd.own.mk> # for some variables
-RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID BUILDSEED \
+RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID BUILDINFO BUILDSEED \
DESTDIR DISTRIBVER EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \
HAVE_LLVM HAVE_PCC INSTALLWORLDDIR \
KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR \
