Fri May 3 21:32:05 2013 UTC ()
Make this build with the disk label change.


(matt)
diff -r1.13 -r1.14 src/usr.sbin/installboot/arch/hp300.c
diff -r1.15 -r1.16 src/usr.sbin/installboot/arch/vax.c
cvs diff -r1.13 -r1.14 src/usr.sbin/installboot/arch/hp300.c (expand / switch to unified diff)

--- src/usr.sbin/installboot/arch/hp300.c 2011/02/10 23:25:11 1.13
+++ src/usr.sbin/installboot/arch/hp300.c 2013/05/03 21:32:04 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: hp300.c,v 1.13 2011/02/10 23:25:11 tsutsui Exp $ */ 1/* $NetBSD: hp300.c,v 1.14 2013/05/03 21:32:04 matt Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2003 The NetBSD Foundation, Inc. 4 * Copyright (c) 2003 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by David Laight. 8 * by David Laight.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -25,32 +25,33 @@ @@ -25,32 +25,33 @@
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#if HAVE_NBTOOL_CONFIG_H 32#if HAVE_NBTOOL_CONFIG_H
33#include "nbtool_config.h" 33#include "nbtool_config.h"
34#endif 34#endif
35 35
36#include <sys/cdefs.h> 36#include <sys/cdefs.h>
37#if !defined(__lint) 37#if !defined(__lint)
38__RCSID("$NetBSD: hp300.c,v 1.13 2011/02/10 23:25:11 tsutsui Exp $"); 38__RCSID("$NetBSD: hp300.c,v 1.14 2013/05/03 21:32:04 matt Exp $");
39#endif /* !__lint */ 39#endif /* !__lint */
40 40
41/* We need the target disklabel.h, not the hosts one..... */ 41/* We need the target disklabel.h, not the hosts one..... */
42#ifdef HAVE_NBTOOL_CONFIG_H 42#ifdef HAVE_NBTOOL_CONFIG_H
43#include "nbtool_config.h" 43#include "nbtool_config.h"
 44#include <nbinclude/hp300/disklabel.h>
44#include <nbinclude/sys/disklabel.h> 45#include <nbinclude/sys/disklabel.h>
45#else  46#else
46#include <sys/disklabel.h> 47#include <sys/disklabel.h>
47#endif 48#endif
48#include <sys/fcntl.h> 49#include <sys/fcntl.h>
49#include <sys/ioctl.h> 50#include <sys/ioctl.h>
50#include <sys/mman.h> 51#include <sys/mman.h>
51#include <sys/param.h> 52#include <sys/param.h>
52 53
53#include <assert.h> 54#include <assert.h>
54#include <err.h> 55#include <err.h>
55#include <md5.h> 56#include <md5.h>
56#include <stddef.h> 57#include <stddef.h>
cvs diff -r1.15 -r1.16 src/usr.sbin/installboot/arch/vax.c (expand / switch to unified diff)

--- src/usr.sbin/installboot/arch/vax.c 2013/04/04 16:11:12 1.15
+++ src/usr.sbin/installboot/arch/vax.c 2013/05/03 21:32:04 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: vax.c,v 1.15 2013/04/04 16:11:12 martin Exp $ */ 1/* $NetBSD: vax.c,v 1.16 2013/05/03 21:32:04 matt Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. 4 * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Simon Burge. 8 * by Simon Burge.
9 * 9 *
10 * This code is derived from software contributed to The NetBSD Foundation 10 * This code is derived from software contributed to The NetBSD Foundation
11 * by Luke Mewburn of Wasabi Systems. 11 * by Luke Mewburn of Wasabi Systems.
12 * 12 *
13 * Redistribution and use in source and binary forms, with or without 13 * Redistribution and use in source and binary forms, with or without
14 * modification, are permitted provided that the following conditions 14 * modification, are permitted provided that the following conditions
@@ -58,31 +58,36 @@ @@ -58,31 +58,36 @@
58 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 58 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
59 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 59 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
60 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 60 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
61 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 61 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
62 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 62 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
63 */ 63 */
64 64
65#if HAVE_NBTOOL_CONFIG_H 65#if HAVE_NBTOOL_CONFIG_H
66#include "nbtool_config.h" 66#include "nbtool_config.h"
67#endif 67#endif
68 68
69#include <sys/cdefs.h> 69#include <sys/cdefs.h>
70#if !defined(__lint) 70#if !defined(__lint)
71__RCSID("$NetBSD: vax.c,v 1.15 2013/04/04 16:11:12 martin Exp $"); 71__RCSID("$NetBSD: vax.c,v 1.16 2013/05/03 21:32:04 matt Exp $");
72#endif /* !__lint */ 72#endif /* !__lint */
73 73
74#include <sys/param.h> 74#include <sys/param.h>
 75#ifdef HAVE_NBTOOL_CONFIG_H
 76#include <nbinclude/vax/disklabel.h>
 77#include <nbinclude/sys/disklabel.h>
 78#else
75#include <sys/disklabel.h> 79#include <sys/disklabel.h>
 80#endif
76 81
77#include <assert.h> 82#include <assert.h>
78#include <err.h> 83#include <err.h>
79#include <stddef.h> 84#include <stddef.h>
80#include <stdio.h> 85#include <stdio.h>
81#include <stdlib.h> 86#include <stdlib.h>
82#include <string.h> 87#include <string.h>
83#include <unistd.h> 88#include <unistd.h>
84 89
85#include "installboot.h" 90#include "installboot.h"
86 91
87#ifndef __CTASSERT 92#ifndef __CTASSERT
88#define __CTASSERT(X) 93#define __CTASSERT(X)