Source-Changes-HG archive

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

[src/trunk]: src/etc give the kernel pax invocating the MKREPRO_TIMESTAMP tre...



details:   https://anonhg.NetBSD.org/src/rev/409011bf1e80
branches:  trunk
changeset: 342397:409011bf1e80
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Dec 20 02:35:34 2015 +0000

description:
give the kernel pax invocating the MKREPRO_TIMESTAMP treatment.

diffstat:

 etc/Makefile |  27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diffs (55 lines):

diff -r e23c9a4e22ba -r 409011bf1e80 etc/Makefile
--- a/etc/Makefile      Sun Dec 20 01:34:00 2015 +0000
+++ b/etc/Makefile      Sun Dec 20 02:35:34 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.425 2015/12/19 23:37:43 christos Exp $
+#      $NetBSD: Makefile,v 1.426 2015/12/20 02:35:34 christos Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -67,6 +67,19 @@
 MKISOFS_FLAGS+=        -quiet
 .endif
  
+# Reproducible build parameters
+.if ${MKREPRO:Uno} == "no"
+BUILDER!=      echo $${USER-root}@$$(hostname)
+.else
+BUILDER=       builder%localhost.NetBSD.org@localhost
+.endif
+.if ${MKREPRO_TIMESTAMP:Uno} == "no"
+PAX_TIMESTAMP=
+BUILD_DATE!=   date -u
+.else
+PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
+BUILD_DATE!=   date -u -r "${MKREPRO_TIMESTAMP}"
+.endif
 
 # MD Makefile.inc may append MD targets to BIN[123].  Make sure all
 # are empty, to preserve the old semantics of setting them below with "+=".
@@ -185,16 +198,6 @@
            > ${.TARGET}
 
 .include "${NETBSDSRCDIR}/etc/Makefile.params"
-.if ${MKREPRO:Uno} == "no"
-BUILDER!=      echo $${USER-root}@$$(hostname)
-.else
-BUILDER=       builder%localhost.NetBSD.org@localhost
-.endif
-.if ${MKREPRO_TIMESTAMP:Uno} == "no"
-BUILD_DATE!=   date -u
-.else
-BUILD_DATE!=   date -u -r "${MKREPRO_TIMESTAMP}"
-.endif
 
 CLEANFILES+=   etc-release
 etc-release: .EXEC .MAKE
@@ -608,7 +611,7 @@
        kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
        kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
        kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.tgz; \
-       pax_cmd="GZIP=${GZIP_FLAGS:Q} ${TOOL_PAX} --use-compress-program ${TOOL_GZIP:Q} -O -w -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
+       pax_cmd="GZIP=${GZIP_FLAGS:Q} ${TOOL_PAX} ${PAX_TIMESTAMP} --use-compress-program ${TOOL_GZIP:Q} -O -w -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
        cd $${kerndir} && { \
                kernels=; newest=; \
                for kernel in $${kernlist}; do \



Home | Main Index | Thread Index | Old Index