Module Name: src
Committed By: snj
Date: Sun Mar 29 07:42:53 UTC 2015
Modified Files:
src/distrib/atari/floppies/common [netbsd-7]: list.images
src/sys/arch/atari/stand/installboot [netbsd-7]: Makefile installboot.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #651):
distrib/atari/floppies/common/list.images: revision 1.10
sys/arch/atari/stand/installboot/Makefile: revision 1.8
sys/arch/atari/stand/installboot/installboot.c: revision 1.34
Disable "OS bootversion check" on crunched binaries for installation media.
This oscheck() function seems implemented to check compatibility
between bootloaders and /netbsd kernel, but checking /netbsd using kvm(3)
doesn't make sense on installation or even future cross builds, and
probably we will never bump bootloader version without compatibility
per recent 14 years history.
This works around overflow of 1440KB 2HD sysinst.fs, and would also be
worth to pullup to netbsd-7.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.26.1 src/distrib/atari/floppies/common/list.images
cvs rdiff -u -r1.6.28.1 -r1.6.28.2 \
src/sys/arch/atari/stand/installboot/Makefile
cvs rdiff -u -r1.28 -r1.28.4.1 \
src/sys/arch/atari/stand/installboot/installboot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/atari/floppies/common/list.images
diff -u src/distrib/atari/floppies/common/list.images:1.9 src/distrib/atari/floppies/common/list.images:1.9.26.1
--- src/distrib/atari/floppies/common/list.images:1.9 Sun Feb 21 20:18:08 2010
+++ src/distrib/atari/floppies/common/list.images Sun Mar 29 07:42:53 2015
@@ -1,7 +1,7 @@
-# $NetBSD: list.images,v 1.9 2010/02/21 20:18:08 tsutsui Exp $
+# $NetBSD: list.images,v 1.9.26.1 2015/03/29 07:42:53 snj Exp $
SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/atari/stand
-LIBS libhack.o -lprop -lrmt -lz -lutil -lcurses -lterminfo -lkvm -ll -lm
+LIBS libhack.o -lprop -lrmt -lz -lutil -lcurses -lterminfo -ll -lm
# init invokes the shell as -sh
ARGVLN sh -sh
Index: src/sys/arch/atari/stand/installboot/Makefile
diff -u src/sys/arch/atari/stand/installboot/Makefile:1.6.28.1 src/sys/arch/atari/stand/installboot/Makefile:1.6.28.2
--- src/sys/arch/atari/stand/installboot/Makefile:1.6.28.1 Wed Feb 4 06:50:46 2015
+++ src/sys/arch/atari/stand/installboot/Makefile Sun Mar 29 07:42:53 2015
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.6.28.1 2015/02/04 06:50:46 snj Exp $
+# $NetBSD: Makefile,v 1.6.28.2 2015/03/29 07:42:53 snj Exp $
WARNS= 4
PROG= installboot
NOMAN= # defined
SRCS= installboot.c disklabel.c
BINDIR= /usr/mdec
+.ifndef SMALLPROG
+CPPFLAGS+= -DCHECK_OS_BOOTVERSION
LDADD= -lkvm
+.endif
# XXX needs proper struct or union to calculate boot sector uint16_t cksums
CFLAGS+= -fno-strict-aliasing
Index: src/sys/arch/atari/stand/installboot/installboot.c
diff -u src/sys/arch/atari/stand/installboot/installboot.c:1.28 src/sys/arch/atari/stand/installboot/installboot.c:1.28.4.1
--- src/sys/arch/atari/stand/installboot/installboot.c:1.28 Mon Mar 31 06:32:31 2014
+++ src/sys/arch/atari/stand/installboot/installboot.c Sun Mar 29 07:42:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: installboot.c,v 1.28 2014/03/31 06:32:31 ozaki-r Exp $ */
+/* $NetBSD: installboot.c,v 1.28.4.1 2015/03/29 07:42:53 snj Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens
@@ -54,7 +54,9 @@
#include "installboot.h"
static void usage(void);
+#ifdef CHECK_OS_BOOTVERSION
static void oscheck(void);
+#endif
static u_int abcksum(void *);
static void setNVpref(void);
static void setIDEpar(u_int8_t *, size_t);
@@ -99,8 +101,10 @@ main(int argc, char *argv[])
char *devchr;
int fd, c;
+#ifdef CHECK_OS_BOOTVERSION
/* check OS bootversion */
oscheck();
+#endif
/* parse options */
while ((c = getopt(argc, argv, "Nmt:u:v")) != -1) {
@@ -177,6 +181,7 @@ main(int argc, char *argv[])
return(EXIT_SUCCESS);
}
+#ifdef CHECK_OS_BOOTVERSION
static void
oscheck(void)
{
@@ -208,6 +213,7 @@ oscheck(void)
errx(EXIT_FAILURE, "Kern bootversion: %d, expected: %d",
kvers, BOOTVERSION);
}
+#endif
static void
install_fd(char *devnm, struct disklabel *label)
