[src/trunk]: src/distrib Make building boot images work with xz sets on non-N...

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

details:   https://anonhg.NetBSD.org/src/rev/7e6ad2cc2e1a
branches:  trunk
changeset: 445996:7e6ad2cc2e1a
user:      aymeric <aymeric%NetBSD.org@localhost>
date:      Mon Nov 19 20:05:37 2018 +0000

description:
Make building boot images work with xz sets on non-NetBSD hosts.

NetBSD gzip is not toolified so we can't assume the host gzip will be able
to decompress xz files. Use the toolified xz instead in the USE_XZ_SETS case.

diffstat:

 distrib/amd64/uefi-installimage/Makefile.bootimage |  7 +++++--
 distrib/common/bootimage/Makefile.bootimage        |  7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r 88519053ab4f -r 7e6ad2cc2e1a distrib/amd64/uefi-installimage/Makefile.bootimage
--- a/distrib/amd64/uefi-installimage/Makefile.bootimage        Mon Nov 19 20:00:28 2018 +0000
+++ b/distrib/amd64/uefi-installimage/Makefile.bootimage        Mon Nov 19 20:05:37 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bootimage,v 1.7 2018/10/07 10:33:44 martin Exp $
+#      $NetBSD: Makefile.bootimage,v 1.8 2018/11/19 20:05:37 aymeric Exp $
 #
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
 #
@@ -228,6 +228,7 @@
 .endif
 
 KERN_SET?=     kern-GENERIC
+COMPRESS_PROGRAM=${"${USE_XZ_SETS:Uno}"!="no":?${TOOL_XZ}:${TOOL_GZIP}}
 TAR_SUFF=      ${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
 SETS?=         ${SETS_DEFAULT}
 IMG_SETS=      ${KERN_SET} ${SETS}
@@ -263,7 +264,9 @@
                false;                                                  \
        fi
        @echo Extracting ${set}.${TAR_SUFF} ...
-       @(cd ${WORKDIR}; ${TOOL_PAX} ${PAX_TIMESTAMP} -rnz -f ${SETS_DIR}/${set}.${TAR_SUFF} .)
+       @(cd ${WORKDIR}; ${TOOL_PAX} ${PAX_TIMESTAMP} -rn \
+               --use-compress-program=${COMPRESS_PROGRAM:Q} \
+               -f ${SETS_DIR}/${set}.${TAR_SUFF} .)
 .endfor
 .if defined(SECONDARY_BOOT)
        @echo Copying secondary boot...
diff -r 88519053ab4f -r 7e6ad2cc2e1a distrib/common/bootimage/Makefile.bootimage
--- a/distrib/common/bootimage/Makefile.bootimage       Mon Nov 19 20:00:28 2018 +0000
+++ b/distrib/common/bootimage/Makefile.bootimage       Mon Nov 19 20:05:37 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bootimage,v 1.18 2018/10/07 18:07:00 martin Exp $
+#      $NetBSD: Makefile.bootimage,v 1.19 2018/11/19 20:05:37 aymeric Exp $
 #
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
 #
@@ -217,6 +217,7 @@
 WORKRCCONF?=   work.rc.conf
 WORKFS?=        work.rootfs
 TARGETFS?=      imgroot.fs
+COMPRESS_PROGRAM=${"${USE_XZ_SETS:Uno}"!="no":?${TOOL_XZ}:${TOOL_GZIP}}
 TAR_SUFF=      ${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
 
 CLEANFILES+=   ${WORKSPEC} ${WORKFSTAB} ${WORKRCCONF} ${WORKFS}
@@ -237,7 +238,9 @@
                false;                                                  \
        fi
        @echo Extracting ${set}.${TAR_SUFF} ...
-       @(cd ${WORKDIR}; ${TOOL_PAX} ${PAX_TIMESTAMP} -rnz -f ${SETS_DIR}/${set}.${TAR_SUFF} .)
+       @(cd ${WORKDIR}; ${TOOL_PAX} ${PAX_TIMESTAMP} -rn \
+               --use-compress-program=${COMPRESS_PROGRAM:Q} \
+               -f ${SETS_DIR}/${set}.${TAR_SUFF} .)
 .endfor
 .if defined(SECONDARY_BOOT)
        @echo Copying secondary boot...