Module Name: src
Committed By: jmcneill
Date: Thu May 28 19:20:57 UTC 2020
Modified Files:
src/distrib/common/bootimage: Makefile.installimage
src/distrib/evbarm/installimage: Makefile
Log Message:
Shrink the evbarm install image by not including the live images on the install
media
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/installimage/Makefile
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/bootimage/Makefile.installimage
diff -u src/distrib/common/bootimage/Makefile.installimage:1.7 src/distrib/common/bootimage/Makefile.installimage:1.8
--- src/distrib/common/bootimage/Makefile.installimage:1.7 Thu May 28 15:12:03 2020
+++ src/distrib/common/bootimage/Makefile.installimage Thu May 28 19:20:57 2020
@@ -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}/${RELEASEMAC
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}
Index: src/distrib/evbarm/installimage/Makefile
diff -u src/distrib/evbarm/installimage/Makefile:1.1 src/distrib/evbarm/installimage/Makefile:1.2
--- src/distrib/evbarm/installimage/Makefile:1.1 Thu May 28 15:23:43 2020
+++ src/distrib/evbarm/installimage/Makefile Thu May 28 19:20:57 2020
@@ -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 <bsd.own.mk>
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"
