Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/etc BUILDINFO part 3: Add BUILDINFO to RELEASEVARS and /etc/...



details:   https://anonhg.NetBSD.org/src/rev/aaf35559ff36
branches:  trunk
changeset: 331145:aaf35559ff36
user:      apb <apb%NetBSD.org@localhost>
date:      Sun Aug 03 09:19:34 2014 +0000

description:
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.

diffstat:

 etc/Makefile        |  14 +++++++++++---
 etc/Makefile.params |   4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r 330b416dcd7a -r aaf35559ff36 etc/Makefile
--- a/etc/Makefile      Sun Aug 03 09:18:16 2014 +0000
+++ b/etc/Makefile      Sun Aug 03 09:19:34 2014 +0000
@@ -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,12 +193,20 @@
                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}
diff -r 330b416dcd7a -r aaf35559ff36 etc/Makefile.params
--- a/etc/Makefile.params       Sun Aug 03 09:18:16 2014 +0000
+++ b/etc/Makefile.params       Sun Aug 03 09:19:34 2014 +0000
@@ -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 \



Home | Main Index | Thread Index | Old Index