Module Name: src
Committed By: martin
Date: Sun Oct 7 18:07:00 UTC 2018
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
Support .tar.xz sets
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/common/bootimage/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/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.17 src/distrib/common/bootimage/Makefile.bootimage:1.18
--- src/distrib/common/bootimage/Makefile.bootimage:1.17 Sat Feb 11 08:08:00 2017
+++ src/distrib/common/bootimage/Makefile.bootimage Sun Oct 7 18:07:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.17 2017/02/11 08:08:00 pgoyette Exp $
+# $NetBSD: Makefile.bootimage,v 1.18 2018/10/07 18:07:00 martin Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -217,6 +217,7 @@ WORKFSTAB?= work.fstab
WORKRCCONF?= work.rc.conf
WORKFS?= work.rootfs
TARGETFS?= imgroot.fs
+TAR_SUFF= ${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
CLEANFILES+= ${WORKSPEC} ${WORKFSTAB} ${WORKRCCONF} ${WORKFS}
CLEANFILES+= ${TARGETFS}
@@ -231,12 +232,12 @@ ${TARGETFS}: prepare_md_post
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...
