Module Name:    src
Committed By:   christos
Date:           Sat Dec 19 22:29:24 UTC 2015

Modified Files:
        src/distrib/sets: Makefile maketars

Log Message:
Obey MKREPRO_TIMESTAMP when creating sets (create all the files in the
sets with that date).


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/Makefile
cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/maketars

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/Makefile
diff -u src/distrib/sets/Makefile:1.99 src/distrib/sets/Makefile:1.100
--- src/distrib/sets/Makefile:1.99	Thu Nov 26 10:41:58 2015
+++ src/distrib/sets/Makefile	Sat Dec 19 17:29:23 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.99 2015/11/26 15:41:58 joerg Exp $
+#	$NetBSD: Makefile,v 1.100 2015/12/19 22:29:23 christos Exp $
 
 # Experimental RCS METALOG versioning
 # (Needs host's rcs(1) commands)
@@ -40,6 +40,9 @@ SETSCMD=	cd ${.CURDIR} && \
 		${HOST_SH}
 
 MAKETARS_FLAGS=
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKETARS_FLAGS+= -T "${MKREPRO_TIMESTAMP}"
+.endif
 .if ${MKX11} != "no"
 MAKESRCTARS_X11_FLAGS=	-x ${X11SRCDIR}
 .endif

Index: src/distrib/sets/maketars
diff -u src/distrib/sets/maketars:1.84 src/distrib/sets/maketars:1.85
--- src/distrib/sets/maketars:1.84	Wed May 27 11:18:29 2015
+++ src/distrib/sets/maketars	Sat Dec 19 17:29:23 2015
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: maketars,v 1.84 2015/05/27 15:18:29 martin Exp $
+# $NetBSD: maketars,v 1.85 2015/12/19 22:29:23 christos Exp $
 #
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -28,6 +28,7 @@ metalog=
 installdir=
 etcdir=
 setlistdir=
+timestamp=
 setfilesonly=false
 quiet=false
 skipkeys=time,md5,sha1,sha384,sha512,rmd160,cksum
@@ -57,6 +58,7 @@ Usage: ${prog} [-L base,x,ext] [-b] [-x]
 	-U		do not preserve file permissions (with -i ..)
 	-d dest		\${DESTDIR}	[${dest}]
 	-t targetdir	\${RELEASEDIR}	[${tars}]
+	-T timestamp	Timestamp to set for all the files in the tar.
 	[setname ...]	Sets to build 	[${lists}]
 USAGE
 	exit 1
@@ -68,7 +70,7 @@ msg()
 }
 
 # handle args
-while getopts L:bxyi:a:m:qs:F:SM:N:Ud:t: ch; do
+while getopts L:bxyi:a:m:qs:F:SM:N:Ud:t:T: ch; do
 	case ${ch} in
 	L)
 		save_IFS="${IFS}"
@@ -129,6 +131,9 @@ while getopts L:bxyi:a:m:qs:F:SM:N:Ud:t:
 	t)
 		tars="${OPTARG}"
 		;;
+	T)
+		timestamp="--timestamp $OPTARG"
+		;;
 	*)
 		usage
 		;;
@@ -208,7 +213,7 @@ runpax() {
 	local s="$1"
 	shift
 	(cd "${dest}" && 
-	    ${PAX} -dOw -N"${etcdir}" -M "$@" < "${setlistdir}/set.${s}")
+	    ${PAX} -dOw ${timestamp} -N"${etcdir}" -M "$@" < "${setlistdir}/set.${s}")
 }
 
 #

Reply via email to