Module Name: src
Committed By: martin
Date: Sun May 31 10:21:35 UTC 2020
Modified Files:
src/distrib/amd64 [netbsd-9]: Makefile
src/distrib/amd64/installimage [netbsd-9]: Makefile
Removed Files:
src/distrib/amd64/uefi-installimage [netbsd-9]: Makefile
Makefile.bootimage Makefile.installimage boot.cfg.in etc.rc
etc.ttys install.sh spec.inst
Log Message:
Pull up following revision(s) (requested by maya in ticket #933):
distrib/amd64/uefi-installimage/spec.inst: file removal
distrib/amd64/uefi-installimage/etc.rc: file removal
distrib/amd64/uefi-installimage/Makefile.bootimage: file removal
distrib/amd64/uefi-installimage/Makefile.installimage: file removal
distrib/amd64/uefi-installimage/install.sh: file removal
distrib/amd64/uefi-installimage/etc.ttys: file removal
distrib/amd64/Makefile: revision 1.14
distrib/amd64/uefi-installimage/boot.cfg.in: file removal
distrib/amd64/uefi-installimage/Makefile: file removal
distrib/amd64/installimage/Makefile: revision 1.11
rename amd64 uefi-installimage to be just installimage.
Works for both purposes, no confusing name.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.12.1 src/distrib/amd64/Makefile
cvs rdiff -u -r1.10 -r1.10.2.1 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.6.2.1 -r0 src/distrib/amd64/uefi-installimage/Makefile
cvs rdiff -u -r1.11.2.2 -r0 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
cvs rdiff -u -r1.2.18.1 -r0 \
src/distrib/amd64/uefi-installimage/Makefile.installimage
cvs rdiff -u -r1.2 -r0 src/distrib/amd64/uefi-installimage/boot.cfg.in
cvs rdiff -u -r1.1 -r0 src/distrib/amd64/uefi-installimage/etc.rc \
src/distrib/amd64/uefi-installimage/etc.ttys \
src/distrib/amd64/uefi-installimage/install.sh \
src/distrib/amd64/uefi-installimage/spec.inst
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/Makefile
diff -u src/distrib/amd64/Makefile:1.13 src/distrib/amd64/Makefile:1.13.12.1
--- src/distrib/amd64/Makefile:1.13 Sun May 21 15:28:37 2017
+++ src/distrib/amd64/Makefile Sun May 31 10:21:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/05/21 15:28:37 riastradh Exp $
+# $NetBSD: Makefile,v 1.13.12.1 2020/05/31 10:21:34 martin Exp $
.include <bsd.own.mk>
@@ -14,7 +14,6 @@ SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= liveimage
SUBDIR+= installimage
-SUBDIR+= uefi-installimage
TARGETS+= release
iso_image:
@@ -25,6 +24,5 @@ live_image:
install_image:
${MAKEDIRTARGET} installimage install_image
- ${MAKEDIRTARGET} uefi-installimage install_image
.include <bsd.subdir.mk>
Index: src/distrib/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.10 src/distrib/amd64/installimage/Makefile:1.10.2.1
--- src/distrib/amd64/installimage/Makefile:1.10 Sat Dec 15 18:03:16 2018
+++ src/distrib/amd64/installimage/Makefile Sun May 31 10:21:34 2020
@@ -1,16 +1,21 @@
-# $NetBSD: Makefile,v 1.10 2018/12/15 18:03:16 gson Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2020/05/31 10:21:34 martin Exp $
.include <bsd.own.mk>
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1450 # for all installation binaries
+INSTIMAGEMB?= 1550 # for all installation binaries
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
+#EFIBOOT+= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootia32/bootia32.efi
USE_MBR= yes
+USE_GPT= yes
CLEANFILES+= boot.cfg
@@ -35,4 +40,4 @@ IMGFILE_EXTRA= \
${SYSINSTDIR}/sysinstmsgs.pl . \
${SYSINSTDIR}/sysinst .
-.include "${DISTRIBDIR}/common/bootimage/Makefile.installimage"
+.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
