[src/trunk]: src/distrib/amd64/uefi-installimage Support .tar.xz format for s...

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

details:   https://anonhg.NetBSD.org/src/rev/984b06595adf
branches:  trunk
changeset: 836272:984b06595adf
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Oct 07 10:33:44 2018 +0000

description:
Support .tar.xz format for sets.

diffstat:

 distrib/amd64/uefi-installimage/Makefile.bootimage |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r 2ed414fdf8cb -r 984b06595adf distrib/amd64/uefi-installimage/Makefile.bootimage
--- a/distrib/amd64/uefi-installimage/Makefile.bootimage        Sun Oct 07 08:00:49 2018 +0000
+++ b/distrib/amd64/uefi-installimage/Makefile.bootimage        Sun Oct 07 10:33:44 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bootimage,v 1.6 2017/02/16 03:47:23 christos Exp $
+#      $NetBSD: Makefile.bootimage,v 1.7 2018/10/07 10:33:44 martin Exp $
 #
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
 #
@@ -228,6 +228,7 @@
 .endif
 
 KERN_SET?=     kern-GENERIC
+TAR_SUFF=      ${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
 SETS?=         ${SETS_DEFAULT}
 IMG_SETS=      ${KERN_SET} ${SETS}
 SETS_DIR?=     ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
@@ -257,12 +258,12 @@
        fi;
        @${MKDIR} ${MKDIRPERM} ${WORKDIR}
 .for set in ${IMG_SETS}
-       @if [ ! -f ${SETS_DIR}/${set}.tgz ]; then                       \
-               echo "Missing ${SETS_DIR}/${set}.tgz, aborting";        \
+       @if [ ! -f ${SETS_DIR}/${set}.${TAR_SUFF} ]; then               \
+               echo "Missing ${SETS_DIR}/${set}.${TAR_SUFF}, aborting";\
                false;                                                  \
        fi
-       @echo Extracting ${set}.tgz ...
-       @(cd ${WORKDIR}; ${TOOL_PAX} ${PAX_TIMESTAMP} -rnz -f ${SETS_DIR}/${set}.tgz .)
+       @echo Extracting ${set}.${TAR_SUFF} ...
+       @(cd ${WORKDIR}; ${TOOL_PAX} ${PAX_TIMESTAMP} -rnz -f ${SETS_DIR}/${set}.${TAR_SUFF} .)
 .endfor
 .if defined(SECONDARY_BOOT)
        @echo Copying secondary boot...