Module Name: src
Committed By: mrg
Date: Sun May 8 08:12:45 UTC 2022
Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/installimage-bios: Makefile
Added Files:
src/distrib/amd64/installimage: installimage.mk
Log Message:
fix building amd64 with USE_XZ_SETS=no.
bump the size of images if USE_XZ_SETS != no. consolidate a lot of
the code between installimage/Makefile and installimage-bios/Makefile
into installimage/installimage.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/installimage/installimage.mk
cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/installimage-bios/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/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.21 src/distrib/amd64/installimage/Makefile:1.22
--- src/distrib/amd64/installimage/Makefile:1.21 Mon Jan 3 12:10:17 2022
+++ src/distrib/amd64/installimage/Makefile Sun May 8 08:12:45 2022
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2022/01/03 12:10:17 martin Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/08 08:12:45 mrg Exp $
.include <bsd.own.mk>
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 2250 # for all installation binaries
+.include "installimage.mk"
-PRIMARY_BOOT= bootxx_ffsv1
-SECONDARY_BOOT= boot
-SECONDARY_BOOT_ARG= # unnecessary
EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi
EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi
#EFIBOOT= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootx64/bootx64.efi
@@ -17,22 +14,3 @@ EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.
USE_MBR= yes
USE_GPT= yes
USE_GPTMBR= yes
-
-CLEANFILES+= boot.cfg
-
-prepare_md_post:
- ${TOOL_SED} \
- -e "s/@@MACHINE@@/${MACHINE}/" \
- -e "s/@@VERSION@@/${DISTRIBVER}/" \
- < ${.CURDIR}/boot.cfg.in > boot.cfg
-
-DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
-
-SPEC_EXTRA= ${.CURDIR}/spec.inst
-IMGFILE_EXTRA= \
- ${.CURDIR}/etc.ttys etc/ttys \
- ${.CURDIR}/etc.rc etc/rc \
- ${.CURDIR}/install.sh . \
- ${.OBJDIR}/boot.cfg .
-
-.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u src/distrib/amd64/installimage-bios/Makefile:1.5 src/distrib/amd64/installimage-bios/Makefile:1.6
--- src/distrib/amd64/installimage-bios/Makefile:1.5 Mon Jan 3 12:10:17 2022
+++ src/distrib/amd64/installimage-bios/Makefile Sun May 8 08:12:45 2022
@@ -1,32 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2022/01/03 12:10:17 martin Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/08 08:12:45 mrg Exp $
.include <bsd.own.mk>
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 2250 # for all installation binaries
-
-PRIMARY_BOOT= bootxx_ffsv1
-SECONDARY_BOOT= boot
-SECONDARY_BOOT_ARG= # unnecessary
+.include "../installimage/installimage.mk"
USE_MBR= yes
-
-CLEANFILES+= boot.cfg
-
-prepare_md_post:
- ${TOOL_SED} \
- -e "s/@@MACHINE@@/${MACHINE}/" \
- -e "s/@@VERSION@@/${DISTRIBVER}/" \
- < ${.CURDIR}/boot.cfg.in > boot.cfg
-
-DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
-
-SPEC_EXTRA= ${.CURDIR}/spec.inst
-IMGFILE_EXTRA= \
- ${.CURDIR}/etc.ttys etc/ttys \
- ${.CURDIR}/etc.rc etc/rc \
- ${.CURDIR}/install.sh . \
- ${.OBJDIR}/boot.cfg .
-
-.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Added files:
Index: src/distrib/amd64/installimage/installimage.mk
diff -u /dev/null src/distrib/amd64/installimage/installimage.mk:1.1
--- /dev/null Sun May 8 08:12:45 2022
+++ src/distrib/amd64/installimage/installimage.mk Sun May 8 08:12:45 2022
@@ -0,0 +1,33 @@
+# $NetBSD: installimage.mk,v 1.1 2022/05/08 08:12:45 mrg Exp $
+
+# common code between distrib/amd64/installimage/Makefile and
+# distrib/amd64/installimage-bios/Makefile.
+
+.if ${USE_XZ_SETS:Uno} != "no"
+INSTIMAGEMB?= 2250 # for all installation binaries
+.else
+INSTIMAGEMB?= 3500 # for all installation binaries
+.endif
+
+PRIMARY_BOOT= bootxx_ffsv1
+SECONDARY_BOOT= boot
+SECONDARY_BOOT_ARG= # unnecessary
+
+CLEANFILES+= boot.cfg
+
+prepare_md_post:
+ ${TOOL_SED} \
+ -e "s/@@MACHINE@@/${MACHINE}/" \
+ -e "s/@@VERSION@@/${DISTRIBVER}/" \
+ < ${.CURDIR}/boot.cfg.in > boot.cfg
+
+DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
+
+SPEC_EXTRA= ${.CURDIR}/spec.inst
+IMGFILE_EXTRA= \
+ ${.CURDIR}/etc.ttys etc/ttys \
+ ${.CURDIR}/etc.rc etc/rc \
+ ${.CURDIR}/install.sh . \
+ ${.OBJDIR}/boot.cfg .
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
