Module Name: src
Committed By: martin
Date: Fri Sep 28 15:11:36 UTC 2018
Modified Files:
src/etc: Makefile
Log Message:
Prepare for .tar.xz sets
To generate a diff of this commit:
cvs rdiff -u -r1.433 -r1.434 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.433 src/etc/Makefile:1.434
--- src/etc/Makefile:1.433 Sun Apr 1 04:35:02 2018
+++ src/etc/Makefile Fri Sep 28 15:11:36 2018
@@ -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 @@ install-obsolete-lists: .PHONY .MAKE
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 @@ distrib-dirs: .PHONY check_DESTDIR
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 @@ snap_post: .PHONY .MAKE build_kernelsets
# 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 @@ kernset-${configfile}: .PHONY build_kern
@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 \
