Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/common Add a variable CDMAKEFSEXTRAOPTS to provide a...



details:   https://anonhg.NetBSD.org/src/rev/daedeceb2d99
branches:  trunk
changeset: 796386:daedeceb2d99
user:      martin <martin%NetBSD.org@localhost>
date:      Sat May 31 10:18:47 2014 +0000

description:
Add a variable CDMAKEFSEXTRAOPTS to provide additional parameters to the
makefs invocation that do not belong in the image option list (CDMAKEFSOPTIONS)

diffstat:

 distrib/common/Makefile.bootcd |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 6db37f87d1ea -r daedeceb2d99 distrib/common/Makefile.bootcd
--- a/distrib/common/Makefile.bootcd    Sat May 31 08:52:54 2014 +0000
+++ b/distrib/common/Makefile.bootcd    Sat May 31 10:18:47 2014 +0000
@@ -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 @@
        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



Home | Main Index | Thread Index | Old Index