diff --git a/distrib/common/bootimage/Makefile.installimage b/distrib/common/bootimage/Makefile.installimage index c66c327a3d5c..32bd54dab6cc 100644 --- a/distrib/common/bootimage/Makefile.installimage +++ b/distrib/common/bootimage/Makefile.installimage @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.installimage,v 1.7 2020/05/28 15:12:03 jmcneill Exp $ +# $NetBSD: Makefile.installimage,v 1.8 2020/05/28 19:20:57 jmcneill Exp $ # # Common Makefile to create a bootable installation image for USB flash etc. # @@ -49,6 +49,9 @@ IMGDIR_EXTRA= ${RELEASEDIR}/${RELEASEMACHINEDIR} ${RELEASEMACHINEDIR} IMGDIR_EXCLUDE= -s ',./installation/cdrom.*,,gp' IMGDIR_EXCLUDE+= -s ',./installation/liveimage.*,,gp' IMGDIR_EXCLUDE+= -s ',./installation/installimage.*,,gp' +.if defined(MD_IMGDIR_EXCLUDE) +IMGDIR_EXCLUDE+= ${MD_IMGDIR_EXCLUDE} +.endif IMGBASE= ${INSTIMGBASE} diff --git a/distrib/evbarm/installimage/Makefile b/distrib/evbarm/installimage/Makefile index 6dee9eca76c5..2bd38b1beae4 100644 --- a/distrib/evbarm/installimage/Makefile +++ b/distrib/evbarm/installimage/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2020/05/28 15:23:43 jmcneill Exp $ +# $NetBSD: Makefile,v 1.2 2020/05/28 19:20:57 jmcneill Exp $ .include INSTIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-install # gives ${IMGBASE}.img -INSTIMAGEMB?= 1550 # for all installation binaries +INSTIMAGEMB?= 750 # for all installation binaries .if ${MACHINE_ARCH} == "aarch64" EFIBOOT= ${WORKDIR}/usr/mdec/bootaa64.efi @@ -30,4 +30,7 @@ IMGFILE_EXTRA= \ ${SYSINSTDIR}/sysinstmsgs.pl . \ ${SYSINSTDIR}/sysinst . +MD_IMGDIR_EXCLUDE= -s ',./binary/gzimg.*,,gp' +MD_IMGDIR_EXCLUDE+= -s ',./binary/instkernel.*,,gp' + .include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"