Source-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/src/rev/c8585018f543
branches:  trunk
changeset: 433697:c8585018f543
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Sep 28 15:11:36 2018 +0000

description:
Prepare for .tar.xz sets

diffstat:

 etc/Makefile |  18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r 53885e383ddb -r c8585018f543 etc/Makefile
--- a/etc/Makefile      Fri Sep 28 15:05:19 2018 +0000
+++ b/etc/Makefile      Fri Sep 28 15:11:36 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.433 2018/04/01 04:35:02 ryo Exp $
+#      $NetBSD: Makefile,v 1.434 2018/09/28 15:11:36 martin Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -410,6 +410,14 @@
 distrib-dirs: .PHONY check_DESTDIR
        cd ${NETBSDSRCDIR}/etc/mtree && ${MAKE} distrib-dirs
 
+.if ${USE_XZ_SETS} != "no"
+COMPRESS_PROGRAM=${TOOL_XZ}
+XZ_OPT=-9
+TAR_SUFF=tar.xz
+.else
+COMPRESS_PROGRAM=${TOOL_GZIP}
+TAR_SUFF=tgz
+.endif
 
 # release, snapshot --
 #      Build a full distribution including kernels & install media.
@@ -417,7 +425,7 @@
 release snapshot: .PHONY .MAKE check_DESTDIR check_RELEASEDIR snap_md_post
        ${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib/sets sets
        ${MAKESUMS} -A -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets \
-               ${KERNEL_SETS:@.SETS.@kern-${.SETS.}.tgz@}
+               ${KERNEL_SETS:@.SETS.@kern-${.SETS.}.${TAR_SUFF}@}
        ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel '*.gz'
 
 
@@ -543,7 +551,7 @@
 #                              kern-${kernel}.tgz.  These kernels
 #                              are also placed in the binary/kernel
 #                              area of the release package as
-#                              netbsd-${kernel}.gz.
+#                              netbsd-${kernel}.gz (or .tar.xz).
 #
 #      EXTRA_KERNELS           Additional kernels to place in the
 #                              binary/kernel area of the release
@@ -609,8 +617,8 @@
        @kernlist=$$(${GETKERNELAWK} ${KERNCONFDIR}/${configfile}); \
        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} ${PAX_TIMESTAMP} --use-compress-program ${TOOL_GZIP:Q} -O -w -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
+       kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.${TAR_SUFF}; \
+       pax_cmd="GZIP=${GZIP_FLAGS:Q} XZ_OPT=${XZ_OPT:Q} ${TOOL_PAX} ${PAX_TIMESTAMP} --use-compress-program ${COMPRESS_PROGRAM: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