Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Obey MKREPRO_TIMESTAMP when creating sets (create all the files in the

Browse Source 
sets with that date).
This commit is contained in:
christos 2015-12-19 22:29:23 +00:00
parent bb53f16923
commit ad8d11c3eb
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
distrib/sets/Makefile
View File

@ -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 # Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands) # (Needs host's rcs(1) commands)
@ -40,6 +40,9 @@ SETSCMD= cd ${.CURDIR} && \
${HOST_SH} ${HOST_SH}
MAKETARS_FLAGS= MAKETARS_FLAGS=
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
MAKETARS_FLAGS+= -T "${MKREPRO_TIMESTAMP}"
.endif
.if ${MKX11} != "no" .if ${MKX11} != "no"
MAKESRCTARS_X11_FLAGS= -x ${X11SRCDIR} MAKESRCTARS_X11_FLAGS= -x ${X11SRCDIR}
.endif .endif

11
distrib/sets/maketars
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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: # Make release tar files for some or all lists. Usage:
# maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir] # maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@ -28,6 +28,7 @@ metalog=
installdir= installdir=
etcdir= etcdir=
setlistdir= setlistdir=
timestamp=
setfilesonly=false setfilesonly=false
quiet=false quiet=false
skipkeys=time,md5,sha1,sha384,sha512,rmd160,cksum skipkeys=time,md5,sha1,sha384,sha512,rmd160,cksum
@ -57,6 +58,7 @@ Usage: ${prog} [-L base,x,ext] [-b] [-x] [-y] [-i idir] [-a arch] [-m machine]
-U do not preserve file permissions (with -i ..) -U do not preserve file permissions (with -i ..)
-d dest \${DESTDIR} [${dest}] -d dest \${DESTDIR} [${dest}]
-t targetdir \${RELEASEDIR} [${tars}] -t targetdir \${RELEASEDIR} [${tars}]
-T timestamp Timestamp to set for all the files in the tar.
[setname ...] Sets to build [${lists}] [setname ...] Sets to build [${lists}]
USAGE USAGE
exit 1 exit 1
@ -68,7 +70,7 @@ msg()
} }
# handle args # 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 case ${ch} in
L) L)
save_IFS="${IFS}" save_IFS="${IFS}"
@ -129,6 +131,9 @@ while getopts L:bxyi:a:m:qs:F:SM:N:Ud:t: ch; do
t) t)
tars="${OPTARG}" tars="${OPTARG}"
;; ;;
T)
timestamp="--timestamp $OPTARG"
;;
*) *)
usage usage
;; ;;
@ -208,7 +213,7 @@ runpax() {
local s="$1" local s="$1"
shift shift
(cd "${dest}" && (cd "${dest}" &&
${PAX} -dOw -N"${etcdir}" -M "$@" < "${setlistdir}/set.${s}") ${PAX} -dOw ${timestamp} -N"${etcdir}" -M "$@" < "${setlistdir}/set.${s}")
} }
# #