Module Name: src
Committed By: martin
Date: Sun Oct 7 10:33:44 UTC 2018
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Log Message:
Support .tar.xz format for sets.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.6 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.7
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.6 Thu Feb 16 03:47:23 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Sun Oct 7 10:33:44 2018
@@ -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 @@ SETS_DEFAULT+= xbase xcomp xetc xfont xs
.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 @@ ${TARGETFS}: prepare_md_post pre-targetf
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...
