Module Name: src
Committed By: martin
Date: Sat May 31 10:18:47 UTC 2014
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
Add a variable CDMAKEFSEXTRAOPTS to provide additional parameters to the
makefs invocation that do not belong in the image option list (CDMAKEFSOPTIONS)
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/common/Makefile.bootcd
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/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.24 src/distrib/common/Makefile.bootcd:1.25
--- src/distrib/common/Makefile.bootcd:1.24 Sat Feb 15 09:43:02 2014
+++ src/distrib/common/Makefile.bootcd Sat May 31 10:18:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.24 2014/02/15 09:43:02 dsl Exp $
+# $NetBSD: Makefile.bootcd,v 1.25 2014/05/31 10:18:47 martin Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -25,6 +25,7 @@
# BOOTXX_CD9660 Defaults to $DESTDIR/usr/mdec/bootxx_cd9660
# CDBOOTOPTIONS Options for installboot, eg -o console=com0,speed=9600
# CDMAKEFSOPTIONS Options for makefs, eg bootimage=i386;bootxx,no-emul-boot
+# CDMAKEFSEXTRAOPTS additional options for makefs, e.g. -F specfile
# CDROMS_RELEASEDIR Where to install ${CDBASE}.iso
# CDINSTKERNEL instkernel directory (relative to ${.CURDIR})
# CDKERNELS couples of the form:
@@ -206,7 +207,7 @@ copy-releasedir:
fi
image:
- ${TOOL_MAKEFS} -t cd9660 -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
+ ${TOOL_MAKEFS} -t cd9660 ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
.if ${CDRELEASE} == false
release: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image_md_pre .WAIT image .WAIT image_md_post
