diff --git a/distrib/amd64/installimage/Makefile b/distrib/amd64/installimage/Makefile index 1022de7e225f..d255a63b0b9d 100644 --- a/distrib/amd64/installimage/Makefile +++ b/distrib/amd64/installimage/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:34 riz Exp $ +# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:32 tsutsui Exp $ .include INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img BOOTDISK= sd0 # for USB flash etc. -IMAGEMB= 550 # for all installation binaries +INSTIMAGEMB?= 550 # for all installation binaries PRIMARY_BOOT= bootxx_ffsv1 SECONDARY_BOOT= boot diff --git a/distrib/amd64/liveimage/emuimage/Makefile b/distrib/amd64/liveimage/emuimage/Makefile index 8de7a4dc06f7..6ac13e8b9cf3 100644 --- a/distrib/amd64/liveimage/emuimage/Makefile +++ b/distrib/amd64/liveimage/emuimage/Makefile @@ -1,7 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:35 riz Exp $ +# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:32 tsutsui Exp $ LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live-wd0root # gives ${IMGBASE}.img BOOTDISK= wd0 # for QEMU etc. +.if defined(EMUIMAGEMB) +LIVEIMAGEMB= ${EMUIMAGEMB} +.endif .include "${.CURDIR}/../Makefile.liveimage" diff --git a/distrib/amd64/liveimage/usbimage/Makefile b/distrib/amd64/liveimage/usbimage/Makefile index 87855289a9c8..31358f54b02a 100644 --- a/distrib/amd64/liveimage/usbimage/Makefile +++ b/distrib/amd64/liveimage/usbimage/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:35 riz Exp $ +# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:32 tsutsui Exp $ LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live-sd0root # gives ${IMGBASE}.img +USBIMAGEMB?= 1536 # 2GB USB flash memories aren't 2GiB + BOOTDISK= sd0 # for USB flash etc. -IMAGEMB= 1536 # 2GB USB flash memories aren't 2GiB +LIVEIMAGEMB= ${USBIMAGEMB} OMIT_SWAPIMG= yes # no need to write swap .include "${.CURDIR}/../Makefile.liveimage" diff --git a/distrib/common/bootimage/Makefile.installimage b/distrib/common/bootimage/Makefile.installimage index b2dd91902cbd..84918b2a9e43 100644 --- a/distrib/common/bootimage/Makefile.installimage +++ b/distrib/common/bootimage/Makefile.installimage @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.installimage,v 1.3 2012/04/22 07:23:42 tsutsui Exp $ +# $NetBSD: Makefile.installimage,v 1.4 2012/11/03 14:25:32 tsutsui Exp $ # # Common Makefile to create a bootable installation image for USB flash etc. # @@ -8,6 +8,11 @@ # INSTIMGBASE # Basename of the liveimage # +# Optional variables: +# INSTIMAGEMB +# target image size in MB +# (if empty default IMAGEMB in Makefile.bootimage is used) +# # See Makefile.bootimage for other variables. # @@ -21,6 +26,9 @@ check_INSTIMGBASE: .PHONY .NOTMAIN .endif .endif +.if defined(INSTIMAGEMB) +IMAGEMB= ${INSTIMAGEMB} +.endif SWAPMB= 0 # no swap OMIT_SWAPIMG= yes # nothing to write diff --git a/distrib/common/bootimage/Makefile.liveimage b/distrib/common/bootimage/Makefile.liveimage index d118653cda0e..295b9f5b6617 100644 --- a/distrib/common/bootimage/Makefile.liveimage +++ b/distrib/common/bootimage/Makefile.liveimage @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.liveimage,v 1.2 2012/01/22 16:50:00 tsutsui Exp $ +# $NetBSD: Makefile.liveimage,v 1.3 2012/11/03 14:25:32 tsutsui Exp $ # # Common Makefile to create a bootable FS image for USB flash or emulators # @@ -8,6 +8,11 @@ # LIVEIMGBASE # Basename of the liveimage # +# Optional variables: +# LIVEIMAGEMB +# target image size in MB +# (if empty default IMAGEMB in Makefile.bootimage is used) +# # See Makefile.bootimage for other variables. # @@ -21,6 +26,10 @@ check_LIVEIMGBASE: .PHONY .NOTMAIN .endif .endif +.if defined(LIVEIMAGEMB) +IMAGEMB= ${LIVEIMAGEMB} +.endif + IMGBASE= ${LIVEIMGBASE} .include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.bootimage" diff --git a/distrib/i386/installimage/Makefile b/distrib/i386/installimage/Makefile index bf0074737ef4..8815a48a1c93 100644 --- a/distrib/i386/installimage/Makefile +++ b/distrib/i386/installimage/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:35 riz Exp $ +# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $ .include INSTIMGBASE= NetBSD-${DISTRIBVER}-i386-install # gives ${IMGBASE}.img BOOTDISK= sd0 # for USB flash etc. -IMAGEMB= 512 # for all installation binaries +INSTIMAGEMB?= 512 # for all installation binaries PRIMARY_BOOT= bootxx_ffsv1 SECONDARY_BOOT= boot diff --git a/distrib/i386/liveimage/emuimage/Makefile b/distrib/i386/liveimage/emuimage/Makefile index 933fd4cc6762..2176dce7e616 100644 --- a/distrib/i386/liveimage/emuimage/Makefile +++ b/distrib/i386/liveimage/emuimage/Makefile @@ -1,7 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:35 riz Exp $ +# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $ LIVEIMGBASE= NetBSD-${DISTRIBVER}-i386-live-wd0root # gives ${IMGBASE}.img BOOTDISK= wd0 # for QEMU etc. +.if defined(EMUIMAGEMB) +LIVEIMAGEMB= ${EMUIMAGEMB} +.endif .include "${.CURDIR}/../Makefile.liveimage" diff --git a/distrib/i386/liveimage/usbimage/Makefile b/distrib/i386/liveimage/usbimage/Makefile index 8b3f3c050d32..fc9328469061 100644 --- a/distrib/i386/liveimage/usbimage/Makefile +++ b/distrib/i386/liveimage/usbimage/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:35 riz Exp $ +# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $ LIVEIMGBASE= NetBSD-${DISTRIBVER}-i386-live-sd0root # gives ${IMGBASE}.img +USBIMAGEMB?= 1536 # 2GB USB flash memories aren't 2GiB + BOOTDISK= sd0 # for USB flash etc. -IMAGEMB= 1536 # 2GB USB flash memories aren't 2GiB +LIVEIMAGEMB= ${USBIMAGEMB} OMIT_SWAPIMG= yes # no need to write swap .include "${.CURDIR}/../Makefile.liveimage" diff --git a/distrib/pmax/liveimage/emuimage/Makefile b/distrib/pmax/liveimage/emuimage/Makefile index 7d581b1a2848..7ab4703d4b98 100644 --- a/distrib/pmax/liveimage/emuimage/Makefile +++ b/distrib/pmax/liveimage/emuimage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:35 riz Exp $ +# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $ LIVEIMGBASE= NetBSD-${DISTRIBVER}-pmax-live-sd0root # gives ${IMGBASE}.img @@ -6,6 +6,9 @@ LIVEIMGBASE= NetBSD-${DISTRIBVER}-pmax-live-sd0root # gives ${IMGBASE}.img KERN_SET= kern-GENERIC BOOTDISK= sd0 +.if defined(EMUIMAGEMB) +LIVEIMAGEMB= ${EMUIMAGEMB} +.endif PRIMARY_BOOT= bootxx_ffs #SECONDARY_BOOT= # boot.pmax is extracted from base.tgz SECONDARY_BOOT_ARG= # nothing diff --git a/distrib/sparc/liveimage/emuimage/Makefile b/distrib/sparc/liveimage/emuimage/Makefile index 32a551f0086a..1c15f0213987 100644 --- a/distrib/sparc/liveimage/emuimage/Makefile +++ b/distrib/sparc/liveimage/emuimage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:35 riz Exp $ +# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $ LIVEIMGBASE= NetBSD-${DISTRIBVER}-sparc-live-sd0root # gives ${IMGBASE}.img @@ -6,6 +6,9 @@ LIVEIMGBASE= NetBSD-${DISTRIBVER}-sparc-live-sd0root # gives ${IMGBASE}.img KERN_SET= kern-GENERIC BOOTDISK= sd0 +.if defined(EMUIMAGEMB) +LIVEIMAGEMB= ${EMUIMAGEMB} +.endif PRIMARY_BOOT= bootxx SECONDARY_BOOT= boot SECONDARY_BOOT_ARG= /${SECONDARY_BOOT} diff --git a/distrib/sparc64/liveimage/emuimage/Makefile b/distrib/sparc64/liveimage/emuimage/Makefile index f8e4815b3f18..8f5235fe9d87 100644 --- a/distrib/sparc64/liveimage/emuimage/Makefile +++ b/distrib/sparc64/liveimage/emuimage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:36 riz Exp $ +# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $ LIVEIMGBASE= NetBSD-${DISTRIBVER}-sparc64-live-sd0root # gives ${IMGBASE}.img @@ -7,6 +7,9 @@ LIVEIMGBASE= NetBSD-${DISTRIBVER}-sparc64-live-sd0root # gives ${IMGBASE}.img KERN_SET= kern-GENERIC BOOTDISK= sd0 # for QEMU #BOOTDISK= wd0 # for Ultra5/10 image? +.if defined(EMUIMAGEMB) +LIVEIMAGEMB= ${EMUIMAGEMB} +.endif PRIMARY_BOOT= bootblk #SECONDARY_BOOT= # nothing #SECONDARY_BOOT_ARG= # unnecessary diff --git a/distrib/sun2/liveimage/emuimage/Makefile b/distrib/sun2/liveimage/emuimage/Makefile index 4a5e13656510..82ede9d71881 100644 --- a/distrib/sun2/liveimage/emuimage/Makefile +++ b/distrib/sun2/liveimage/emuimage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:36 riz Exp $ +# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $ LIVEIMGBASE= NetBSD-${DISTRIBVER}-sun2-live-sd0root # gives ${IMGBASE}.img @@ -6,6 +6,9 @@ LIVEIMGBASE= NetBSD-${DISTRIBVER}-sun2-live-sd0root # gives ${IMGBASE}.img KERN_SET= kern-GENERIC BOOTDISK= sd0 +.if defined(EMUIMAGEMB) +LIVEIMAGEMB= ${EMUIMAGEMB} +.endif PRIMARY_BOOT= bootxx SECONDARY_BOOT= ufsboot SECONDARY_BOOT_ARG= /${SECONDARY_BOOT} diff --git a/distrib/sun3/liveimage/emuimage/Makefile b/distrib/sun3/liveimage/emuimage/Makefile index 4682cabd590c..ee39b72d5d87 100644 --- a/distrib/sun3/liveimage/emuimage/Makefile +++ b/distrib/sun3/liveimage/emuimage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:36 riz Exp $ +# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $ LIVEIMGBASE= NetBSD-${DISTRIBVER}-sun3-live-sd0root # gives ${IMGBASE}.img @@ -6,6 +6,9 @@ LIVEIMGBASE= NetBSD-${DISTRIBVER}-sun3-live-sd0root # gives ${IMGBASE}.img KERN_SET= kern-GENERIC BOOTDISK= sd0 +.if defined(EMUIMAGEMB) +LIVEIMAGEMB= ${EMUIMAGEMB} +.endif PRIMARY_BOOT= bootxx SECONDARY_BOOT= ufsboot SECONDARY_BOOT_ARG= /${SECONDARY_BOOT} diff --git a/distrib/vax/liveimage/emuimage/Makefile b/distrib/vax/liveimage/emuimage/Makefile index fa975ef10f10..555bbcb7d784 100644 --- a/distrib/vax/liveimage/emuimage/Makefile +++ b/distrib/vax/liveimage/emuimage/Makefile @@ -1,12 +1,14 @@ -# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:36 riz Exp $ +# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $ LIVEIMGBASE= NetBSD-${DISTRIBVER}-vax-live-ra0root # gives ${IMGBASE}.img .include +EMUIMAGEMB?= 1024 # ra0 can't handle 2GB image + KERN_SET= kern-GENERIC BOOTDISK= ra0 -IMAGEMB= 1024 # ra0 can't handle 2GB image +LIVEIMAGEMB= ${EMUIMAGEMB} PRIMARY_BOOT= xxboot #SECONDARY_BOOT= # boot is extracted from base.tgz SECONDARY_BOOT_ARG= # nothing