head 1.7; access; symbols netbsd-11-0-RC4:1.7 netbsd-11-0-RC3:1.7 netbsd-11-0-RC2:1.7 netbsd-11-0-RC1:1.7 perseant-exfatfs-base-20250801:1.7 netbsd-11:1.7.0.6 netbsd-11-base:1.7 netbsd-10-1-RELEASE:1.7 perseant-exfatfs-base-20240630:1.7 perseant-exfatfs:1.7.0.4 perseant-exfatfs-base:1.7 netbsd-9-4-RELEASE:1.1.2.2 netbsd-10-0-RELEASE:1.7 netbsd-10-0-RC6:1.7 netbsd-10-0-RC5:1.7 netbsd-10-0-RC4:1.7 netbsd-10-0-RC3:1.7 netbsd-10-0-RC2:1.7 netbsd-10-0-RC1:1.7 netbsd-10:1.7.0.2 netbsd-10-base:1.7 netbsd-9-3-RELEASE:1.1.2.2 netbsd-9:1.1.0.2; locks; strict; comment @# @; 1.7 date 2022.05.22.19.32.41; author jmcneill; state Exp; branches; next 1.6; commitid fabPWvHSRCIWr5FD; 1.6 date 2022.05.08.08.12.45; author mrg; state Exp; branches; next 1.5; commitid 4kYIFVDRdV7m8eDD; 1.5 date 2022.01.03.12.10.17; author martin; state Exp; branches; next 1.4; commitid UznGWyBMkfqdtbnD; 1.4 date 2021.12.31.04.59.15; author pgoyette; state Exp; branches; next 1.3; commitid lebZV2FL3oRobLmD; 1.3 date 2021.12.30.15.01.55; author pgoyette; state Exp; branches; next 1.2; commitid DlOXMxgtHUBZxGmD; 1.2 date 2021.12.26.03.07.06; author pgoyette; state Exp; branches; next 1.1; commitid hWQaa0XrU82CI6mD; 1.1 date 2021.10.08.20.24.06; author maya; state Exp; branches 1.1.2.1; next ; commitid 7HaXTC1T8ALIZ2cD; 1.1.2.1 date 2021.10.08.20.24.06; author martin; state dead; branches; next 1.1.2.2; commitid kzLSwVifHPC84VcD; 1.1.2.2 date 2021.10.15.15.14.51; author martin; state Exp; branches; next ; commitid kzLSwVifHPC84VcD; desc @@ 1.7 log @Restore Makefile.installimage include after variables are set. Makes amd64 USB install images bootable again. @ text @# $NetBSD: Makefile,v 1.6 2022/05/08 08:12:45 mrg Exp $ .include INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img .include "../installimage/installimage.mk" USE_MBR= yes .include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage" @ 1.6 log @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. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2022/01/03 12:10:17 martin Exp $ d10 2 @ 1.5 log @There is no point in putting a second sysinst binary into the install image's root filesystem. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2021/12/31 04:59:15 pgoyette Exp $ d7 1 a7 5 INSTIMAGEMB?= 2250 # for all installation binaries PRIMARY_BOOT= bootxx_ffsv1 SECONDARY_BOOT= boot SECONDARY_BOOT_ARG= # unnecessary a9 19 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" @ 1.4 log @Still not big enough - bump some more. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2021/12/30 15:01:55 pgoyette Exp $ a23 1 SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} d30 1 a30 6 ${.OBJDIR}/boot.cfg . \ ${SYSINSTDIR}/sysinstmsgs.de . \ ${SYSINSTDIR}/sysinstmsgs.es . \ ${SYSINSTDIR}/sysinstmsgs.fr . \ ${SYSINSTDIR}/sysinstmsgs.pl . \ ${SYSINSTDIR}/sysinst . @ 1.3 log @With recent changees to debug kernel stuff from Christos we are once again pushing the size limit. Bump it again. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2021/12/26 03:07:06 pgoyette Exp $ d7 1 a7 1 INSTIMAGEMB?= 2180 # for all installation binaries @ 1.2 log @Once again things have grown, so the install image allocation size needs to be bumped. XXX There's gotta be a better way to maintain this! :-) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2021/10/08 20:24:06 maya Exp $ d7 1 a7 1 INSTIMAGEMB?= 2150 # for all installation binaries @ 1.1 log @Restore having a BIOS-only amd64 USB image. Several people reported having hardware that struggles booting the mix EFI+BIOS image, and it's better to offer them a working image. Keeping the EFI image as having the obvious name, this is going to become more likely to work by default as newer hardware may not support BIOS boot. (XXX pullup-9) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.17 2021/06/02 16:07:33 pgoyette Exp $ d7 1 a7 1 INSTIMAGEMB?= 1800 # for all installation binaries @ 1.1.2.1 log @file Makefile was added on branch netbsd-9 on 2021-10-15 15:14:51 +0000 @ text @d1 38 @ 1.1.2.2 log @Pull up following revision(s) (requested by maya in ticket #1360): distrib/amd64/installimage-bios/etc.ttys: revision 1.1 distrib/amd64/installimage-bios/Makefile: revision 1.1 distrib/amd64/Makefile: revision 1.15 distrib/amd64/installimage-bios/boot.cfg.in: revision 1.1 distrib/amd64/installimage-bios/spec.inst: revision 1.1 distrib/amd64/installimage-bios/etc.rc: revision 1.1 distrib/amd64/installimage-bios/install.sh: revision 1.1 Restore having a BIOS-only amd64 USB image. Several people reported having hardware that struggles booting the mix EFI+BIOS image, and it's better to offer them a working image. Keeping the EFI image as having the obvious name, this is going to become more likely to work by default as newer hardware may not support BIOS boot. (XXX pullup-9) @ text @a0 38 # $NetBSD: Makefile,v 1.1 2021/10/08 20:24:06 maya Exp $ .include INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img INSTIMAGEMB?= 1800 # for all installation binaries PRIMARY_BOOT= bootxx_ffsv1 SECONDARY_BOOT= boot SECONDARY_BOOT_ARG= # unnecessary 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 SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} SPEC_EXTRA= ${.CURDIR}/spec.inst IMGFILE_EXTRA= \ ${.CURDIR}/etc.ttys etc/ttys \ ${.CURDIR}/etc.rc etc/rc \ ${.CURDIR}/install.sh . \ ${.OBJDIR}/boot.cfg . \ ${SYSINSTDIR}/sysinstmsgs.de . \ ${SYSINSTDIR}/sysinstmsgs.es . \ ${SYSINSTDIR}/sysinstmsgs.fr . \ ${SYSINSTDIR}/sysinstmsgs.pl . \ ${SYSINSTDIR}/sysinst . .include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage" @