[src/trunk]: src/distrib/sets Prepare for .tar.xz sets

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/69fa9abf9320
branches:  trunk
changeset: 433695:69fa9abf9320
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Sep 28 15:04:20 2018 +0000

description:
Prepare for .tar.xz sets

diffstat:

 distrib/sets/Makefile    |  17 +++++++++++++----
 distrib/sets/makesrctars |   6 +++---
 distrib/sets/makesums    |   8 ++++----
 distrib/sets/maketars    |   4 ++--
 4 files changed, 22 insertions(+), 13 deletions(-)

diffs (135 lines):

diff -r 8e35283ad9b9 -r 69fa9abf9320 distrib/sets/Makefile
--- a/distrib/sets/Makefile     Fri Sep 28 15:03:48 2018 +0000
+++ b/distrib/sets/Makefile     Fri Sep 28 15:04:20 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.103 2016/08/16 01:05:19 mrg Exp $
+#      $NetBSD: Makefile,v 1.104 2018/09/28 15:04:20 martin Exp $
 
 # Experimental RCS METALOG versioning
 # (Needs host's rcs(1) commands)
@@ -15,8 +15,15 @@
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
+.if ${USE_XZ_SETS} != "no"
+COMPRESS_PROGRAM=${TOOL_XZ}
+XZ_OPT=-9
+TAR_SUFF=tar.xz
+.else
 COMPRESS_PROGRAM=${TOOL_GZIP}
 GZIP_FLAGS= ${GZIP_N_FLAG}
+TAR_SUFF=tgz
+.endif
 
 SETSENV=       DESTDIR=${DESTDIR:Q} \
                MACHINE=${MACHINE:Q} \
@@ -32,6 +39,8 @@
                PAX=${TOOL_PAX:Q} \
                COMPRESS_PROGRAM=${COMPRESS_PROGRAM:Q} \
                GZIP=${GZIP_FLAGS:Q} \
+               XZ_OPT=${XZ_OPT:Q} \
+               TAR_SUFF=${TAR_SUFF:Q} \
                PKG_CREATE=${TOOL_PKG_CREATE:Q} \
                SED=${TOOL_SED:Q} \
                TSORT=${TSORT:Q}
@@ -232,11 +241,11 @@
 
 .for tar in ${MAKETARSETS}
 do-${tar}: .PHONY sanitise_METALOG
-       ${_MKMSG_CREATE} "${tar}.tgz"
+       ${_MKMSG_CREATE} "${tar}.${TAR_SUFF}"
        ${SETSCMD} ./maketars -d ${DESTDIR:S,^$,/,} ${MAKETARS_FLAGS} \
            ${METALOG.unpriv} \
            -N ${NETBSDSRCDIR}/etc -t ${TARDIR} ${tar} \
-       || { rm -f ${TARDIR}/${tar}.tgz; false; }
+       || { rm -f ${TARDIR}/${tar}.${TAR_SUFF}; false; }
 .endfor
 
 
@@ -257,7 +266,7 @@
 .for tar in ${MAKETARSETS}
 do-sum-${tar}: .PHONY do-${tar}
        ${_MKMSG_CREATE} "${tar} checksums"
-       ${MAKESUMS} -t ${TARDIR} ${tar}.tgz
+       ${MAKESUMS} -t ${TARDIR} ${tar}.${TAR_SUFF}
        for i in MD5 SHA512; do \
                ${TOOL_CAT} ${TARDIR}/$$i >> ${TARDIR}/$$i.tmp; \
        done
diff -r 8e35283ad9b9 -r 69fa9abf9320 distrib/sets/makesrctars
--- a/distrib/sets/makesrctars  Fri Sep 28 15:03:48 2018 +0000
+++ b/distrib/sets/makesrctars  Fri Sep 28 15:04:20 2018 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#      $NetBSD: makesrctars,v 1.41 2017/04/12 17:29:49 christos Exp $
+#      $NetBSD: makesrctars,v 1.42 2018/09/28 15:04:20 martin Exp $
 #
 # makesrctars srcdir setdir
 #      Create source tarballs in setdir from the source under srcdir.
@@ -150,7 +150,7 @@
 
 msg "Creating checksum files"
 (cd "${setdir}"
-       ${CKSUM} -a md5  *.tgz > MD5
-       ${CKSUM} -a sha512 *.tgz > SHA512
+       ${CKSUM} -a md5  *.tgz *.tar.xz > MD5
+       ${CKSUM} -a sha512 *.tgz *.tar.xz > SHA512
 )
 exit 0
diff -r 8e35283ad9b9 -r 69fa9abf9320 distrib/sets/makesums
--- a/distrib/sets/makesums     Fri Sep 28 15:03:48 2018 +0000
+++ b/distrib/sets/makesums     Fri Sep 28 15:04:20 2018 +0000
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: makesums,v 1.16 2009/09/19 07:09:54 snj Exp $
+# $NetBSD: makesums,v 1.17 2018/09/28 15:04:20 martin Exp $
 #
 # Make checksum files for files in ``tardir''.  Usage:
 # makesums [-a] [-t tardir] [setname [...]]
 #
 # If -t is omitted, RELEASEDIR must be set and not empty.
 # The ``setname'' arguments comprise a list of files to checksum,
-# and may be omitted (in which case ``*.tgz'' is used).
+# and may be omitted (in which case ``*.tgz *.tar.xz'' is used).
 # If -A is given, then the checksum are appended to possibly existing files.
 # NOTE: Don't use this when running parallel jobs
 # If -a is given, then the list of sets is ignored, and ``*'' is used.
@@ -35,7 +35,7 @@
        -A              Append to possible existing checksum files 
        -a              checksum all plain files instead of [setname [...]]
        -t targetdir    \${RELEASEDIR}          [${targetdir}]
-       setname [...]   sets to checksum        [*.tgz]
+       setname [...]   sets to checksum        [*.tgz *.tar.xz]
 USAGE
        exit 1
 }
@@ -69,7 +69,7 @@
 if [ "${dash_all}" = yes ]; then
        pat='*'
 elif [ -z "${pat}" ]; then
-       pat='*.tgz'
+       pat='*.tgz *.tar.xz'
 fi
 lists="$(${FIND} ${pat} -prune \( -type f -o -type l \) \
        \! -name '*SUM' \! -name MD5 \! -name SHA512 2>/dev/null)"
diff -r 8e35283ad9b9 -r 69fa9abf9320 distrib/sets/maketars
--- a/distrib/sets/maketars     Fri Sep 28 15:03:48 2018 +0000
+++ b/distrib/sets/maketars     Fri Sep 28 15:04:20 2018 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: maketars,v 1.88 2018/09/26 18:20:59 martin Exp $
+# $NetBSD: maketars,v 1.89 2018/09/28 15:04:20 martin Exp $
 #
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -226,7 +226,7 @@
 es=0
 
 for setname in ${lists:-${nlists}}; do
-       out="${setname}.tgz"
+       out="${setname}.${TAR_SUFF:-tgz}"
        if [ -n "${installdir}" ]; then
                msg "Copying set ${setname}"
                runpax "${setname}" -r ${preserve} "${installdir}"