Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
aymeric 2018-11-19 20:05:37 +00:00
parent 531981e6f3
commit 3fb201b9dd
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
distrib/amd64/uefi-installimage/Makefile.bootimage
View File

@ -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 @@ SETS_DEFAULT+= xbase xcomp xetc xfont xserver
.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 @@ ${TARGETFS}: prepare_md_post pre-targetfs
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...

7
distrib/common/bootimage/Makefile.bootimage
View File

@ -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 @@ WORKFSTAB?= work.fstab
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 @@ ${TARGETFS}: prepare_md_post
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...