CVS commit: [netbsd-9] src/distrib/amd64/ramdisks/common
Module Name:src
Committed By: snj
Date: Wed Apr 13 03:39:23 UTC 2022
Modified Files:
src/distrib/amd64/ramdisks/common [netbsd-9]: Makefile.ramdisk
list.ramdisk
Log Message:
Pull up following revision(s) (requested by martin in ticket #1436):
distrib/amd64/ramdisks/common/Makefile.ramdisk: revision 1.16
distrib/amd64/ramdisks/common/list.ramdisk: revision 1.22
Add missing EFI bootloaders to the install kernel ramdisk,
noticed by Lloyd Parkes.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 \
src/distrib/amd64/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.21 -r1.21.2.1 src/distrib/amd64/ramdisks/common/list.ramdisk
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/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14.2.1
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14 Sun Jan 27 04:22:46 2019
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Wed Apr 13 03:39:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.14 2019/01/27 04:22:46 dholland Exp $
+# $NetBSD: Makefile.ramdisk,v 1.14.2.1 2022/04/13 03:39:23 snj Exp $
NOSANITIZER= # defined
@@ -28,6 +28,8 @@ IMAGEDEPENDS+= ${CRUNCHBIN} \
${DESTDIR}/usr/mdec/mbr_ext \
${DESTDIR}/usr/mdec/mbr_bootsel \
${DESTDIR}/usr/mdec/gptmbr.bin \
+ ${DESTDIR}/usr/mdec/bootia32.efi \
+ ${DESTDIR}/usr/mdec/bootx64.efi \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
Index: src/distrib/amd64/ramdisks/common/list.ramdisk
diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.21 src/distrib/amd64/ramdisks/common/list.ramdisk:1.21.2.1
--- src/distrib/amd64/ramdisks/common/list.ramdisk:1.21 Mon Oct 1 17:50:08 2018
+++ src/distrib/amd64/ramdisks/common/list.ramdisk Wed Apr 13 03:39:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: list.ramdisk,v 1.21 2018/10/01 17:50:08 martin Exp $
+# $NetBSD: list.ramdisk,v 1.21.2.1 2022/04/13 03:39:23 snj Exp $
SRCDIRS external/bsd/less/bin
SRCDIRS bin sbin usr.bin usr.sbin libexec
@@ -81,6 +81,8 @@ COPY ${DESTDIR}/usr/mdec/bootxx_ffsv1 us
COPY ${DESTDIR}/usr/mdec/bootxx_ffsv2 usr/mdec/bootxx_ffsv2
COPY ${DESTDIR}/usr/mdec/bootxx_lfsv2 usr/mdec/bootxx_lfsv2
COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
+COPY ${DESTDIR}/usr/mdec/bootia32.efi usr/mdec/bootia32.efi
+COPY ${DESTDIR}/usr/mdec/bootx64.efi usr/mdec/bootx64.efi
COPY ${DESTDIR}/usr/mdec/mbr_ext usr/mdec/mbr_ext
COPY ${DESTDIR}/usr/mdec/mbr_bootsel usr/mdec/mbr_bootsel
COPY ${DESTDIR}/usr/mdec/gptmbr.bin usr/mdec/gptmbr.bin
CVS commit: [netbsd-9] src/distrib/amd64/ramdisks/common
Module Name:src Committed By: snj Date: Wed Apr 13 03:39:23 UTC 2022 Modified Files: src/distrib/amd64/ramdisks/common [netbsd-9]: Makefile.ramdisk list.ramdisk Log Message: Pull up following revision(s) (requested by martin in ticket #1436): distrib/amd64/ramdisks/common/Makefile.ramdisk: revision 1.16 distrib/amd64/ramdisks/common/list.ramdisk: revision 1.22 Add missing EFI bootloaders to the install kernel ramdisk, noticed by Lloyd Parkes. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.2.1 \ src/distrib/amd64/ramdisks/common/Makefile.ramdisk cvs rdiff -u -r1.21 -r1.21.2.1 src/distrib/amd64/ramdisks/common/list.ramdisk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/distrib/amd64
Module Name:src
Committed By: martin
Date: Fri Oct 15 15:14:51 UTC 2021
Modified Files:
src/distrib/amd64 [netbsd-9]: Makefile
Added Files:
src/distrib/amd64/installimage-bios [netbsd-9]: Makefile boot.cfg.in
etc.rc etc.ttys install.sh spec.inst
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.13.12.1 -r1.13.12.2 src/distrib/amd64/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/distrib/amd64/installimage-bios/Makefile \
src/distrib/amd64/installimage-bios/boot.cfg.in \
src/distrib/amd64/installimage-bios/etc.rc \
src/distrib/amd64/installimage-bios/etc.ttys \
src/distrib/amd64/installimage-bios/install.sh \
src/distrib/amd64/installimage-bios/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.12.1 src/distrib/amd64/Makefile:1.13.12.2
--- src/distrib/amd64/Makefile:1.13.12.1 Sun May 31 10:21:34 2020
+++ src/distrib/amd64/Makefile Fri Oct 15 15:14:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13.12.1 2020/05/31 10:21:34 martin Exp $
+# $NetBSD: Makefile,v 1.13.12.2 2021/10/15 15:14:51 martin Exp $
.include
@@ -14,6 +14,7 @@ SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= liveimage
SUBDIR+= installimage
+SUBDIR+= installimage-bios
TARGETS+= release
iso_image:
@@ -24,5 +25,6 @@ live_image:
install_image:
${MAKEDIRTARGET} installimage install_image
+ ${MAKEDIRTARGET} installimage-bios install_image
.include
Added files:
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u /dev/null src/distrib/amd64/installimage-bios/Makefile:1.1.2.2
--- /dev/null Fri Oct 15 15:14:51 2021
+++ src/distrib/amd64/installimage-bios/Makefile Fri Oct 15 15:14:51 2021
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1.2.2 2021/10/15 15:14:51 martin 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"
Index: src/distrib/amd64/installimage-bios/boot.cfg.in
diff -u /dev/null src/distrib/amd64/installimage-bios/boot.cfg.in:1.1.2.2
--- /dev/null Fri Oct 15 15:14:51 2021
+++ src/distrib/amd64/installimage-bios/boot.cfg.in Fri Oct 15 15:14:51 2021
@@ -0,0 +1,9 @@
+banner=Welcome to the NetBSD/@@MACHINE@@ @@VERSION@@ installation image
+banner
+banner=
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
+menu=Install NetBSD:boot netbsd
+menu=Drop to boot prompt:prompt
+timeout=30
+clear=1
Index: src/distrib/amd64/installimage-bios/etc.rc
diff -u /dev/null src/distrib/amd64/installimage-bios/etc.rc:1.1.2.2
--- /dev/null Fri Oct 15 15:14:51 2021
+++ src/distrib/amd64/installimage-bios/etc.rc Fri Oct 15 15:14:51 2021
@@ -0,0 +1,49 @@
+# $NetBSD: etc.rc,v 1.1.2.2 2021/10/15 15:14:51 martin Exp $
+#
+# Copyright (c) 1997 Perry E. Metzger
+# Copyright (c) 1994 Christopher G. Demetriou
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1.
CVS commit: [netbsd-9] src/distrib/amd64
Module Name:src Committed By: martin Date: Fri Oct 15 15:14:51 UTC 2021 Modified Files: src/distrib/amd64 [netbsd-9]: Makefile Added Files: src/distrib/amd64/installimage-bios [netbsd-9]: Makefile boot.cfg.in etc.rc etc.ttys install.sh spec.inst Log Message: 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) To generate a diff of this commit: cvs rdiff -u -r1.13.12.1 -r1.13.12.2 src/distrib/amd64/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/distrib/amd64/installimage-bios/Makefile \ src/distrib/amd64/installimage-bios/boot.cfg.in \ src/distrib/amd64/installimage-bios/etc.rc \ src/distrib/amd64/installimage-bios/etc.ttys \ src/distrib/amd64/installimage-bios/install.sh \ src/distrib/amd64/installimage-bios/spec.inst Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/distrib/amd64
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
@@ -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
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
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"
CVS commit: [netbsd-9] src/distrib/amd64
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.
