Module Name: src
Committed By: martin
Date: Thu Feb 20 19:13:29 UTC 2025
Modified Files:
src/distrib/common/bootimage [netbsd-10]: Makefile.bootimage
src/distrib/vax/liveimage/emuimage [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1046):
distrib/vax/liveimage/emuimage/Makefile: revision 1.5
distrib/common/bootimage/Makefile.bootimage: revision 1.43
It turns out vax liveimage requires INSTALLBOOT_AFTER_DISKLABEL.
It looks tools disklabel(8) doesn't preserve installed bootblock
on creating a new label. Confirmed on simh.
Remove "(untested)" comment from INSTALLBOOT_AFTER_DISKLABEL.
Also note vax requires it.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.2.1 \
src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.4 -r1.4.10.1 src/distrib/vax/liveimage/emuimage/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.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.30 src/distrib/common/bootimage/Makefile.bootimage:1.30.2.1
--- src/distrib/common/bootimage/Makefile.bootimage:1.30 Sun May 15 00:05:24 2022
+++ src/distrib/common/bootimage/Makefile.bootimage Thu Feb 20 19:13:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.30 2022/05/15 00:05:24 mrg Exp $
+# $NetBSD: Makefile.bootimage,v 1.30.2.1 2025/02/20 19:13:29 martin Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -50,9 +50,9 @@
# USE_SUNLABEL
# set yes if target disk image requires Sun's label
# (default: no)
-# INSTALLBOOT_AFTER_DISKLABEL (untested)
+# INSTALLBOOT_AFTER_DISKLABEL
# set yes if the target ${MACHINE} requires disklabel
-# to run installboot(8), like hp300
+# to run installboot(8), like hp300 and vax
# (default: empty)
# IMAGEMB
# target image size in MB
Index: src/distrib/vax/liveimage/emuimage/Makefile
diff -u src/distrib/vax/liveimage/emuimage/Makefile:1.4 src/distrib/vax/liveimage/emuimage/Makefile:1.4.10.1
--- src/distrib/vax/liveimage/emuimage/Makefile:1.4 Sat Dec 15 18:03:18 2018
+++ src/distrib/vax/liveimage/emuimage/Makefile Thu Feb 20 19:13:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/12/15 18:03:18 gson Exp $
+# $NetBSD: Makefile,v 1.4.10.1 2025/02/20 19:13:29 martin Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-vax-live # gives ${IMGBASE}.img
@@ -12,4 +12,7 @@ PRIMARY_BOOT= xxboot
#SECONDARY_BOOT= # boot is extracted from base.tgz
SECONDARY_BOOT_ARG= # nothing
+# XXX: tools disklabel(8) for vax doesn't preserve existing bootblock?
+INSTALLBOOT_AFTER_DISKLABEL= yes
+
.include "${.CURDIR}/../../../common/bootimage/Makefile.liveimage"
