[src/netbsd-7]: src Pull up following revision(s) (requested by martin in tic...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/34c38dbdd358
branches:  netbsd-7
changeset: 799158:34c38dbdd358
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Mar 29 07:42:53 2015 +0000

description:
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.

diffstat:

 distrib/atari/floppies/common/list.images      |  4 ++--
 sys/arch/atari/stand/installboot/Makefile      |  5 ++++-
 sys/arch/atari/stand/installboot/installboot.c |  8 +++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diffs (78 lines):

diff -r 4047c3611a56 -r 34c38dbdd358 distrib/atari/floppies/common/list.images
--- a/distrib/atari/floppies/common/list.images Fri Mar 27 11:29:09 2015 +0000
+++ b/distrib/atari/floppies/common/list.images Sun Mar 29 07:42:53 2015 +0000
@@ -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
diff -r 4047c3611a56 -r 34c38dbdd358 sys/arch/atari/stand/installboot/Makefile
--- a/sys/arch/atari/stand/installboot/Makefile Fri Mar 27 11:29:09 2015 +0000
+++ b/sys/arch/atari/stand/installboot/Makefile Sun Mar 29 07:42:53 2015 +0000
@@ -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
diff -r 4047c3611a56 -r 34c38dbdd358 sys/arch/atari/stand/installboot/installboot.c
--- a/sys/arch/atari/stand/installboot/installboot.c    Fri Mar 27 11:29:09 2015 +0000
+++ b/sys/arch/atari/stand/installboot/installboot.c    Sun Mar 29 07:42:53 2015 +0000
@@ -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 @@
        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 @@
        return(EXIT_SUCCESS);
 }
 
+#ifdef CHECK_OS_BOOTVERSION
 static void
 oscheck(void)
 {
@@ -208,6 +213,7 @@
                errx(EXIT_FAILURE, "Kern bootversion: %d, expected: %d",
                    kvers, BOOTVERSION);
 }
+#endif
 
 static void
 install_fd(char *devnm, struct disklabel *label)