[src/trunk]: src/usr.sbin/installboot pull in <sys/bootblock.h> in "installbo...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/usr.sbin/installboot pull in <sys/bootblock.h> in "installbo...
From: lukem <lukem%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 11:00:15 +0000

details:   https://anonhg.NetBSD.org/src/rev/efd34ad0c435
branches:  trunk
changeset: 526931:efd34ad0c435
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue May 14 06:40:32 2002 +0000

description:
pull in <sys/bootblock.h> in "installboot.h" instead of in arch/*.c
(and remove <dev/dec/dec_boot.h>, since <sys/bootblock.h> has that stuff now)

diffstat:

 usr.sbin/installboot/arch/alpha.c   |  10 ++--------
 usr.sbin/installboot/arch/pmax.c    |   9 ++-------
 usr.sbin/installboot/arch/sparc.c   |  10 ++--------
 usr.sbin/installboot/arch/sparc64.c |  10 ++--------
 usr.sbin/installboot/arch/sun68k.c  |  10 ++--------
 usr.sbin/installboot/arch/vax.c     |  10 ++--------
 usr.sbin/installboot/installboot.h  |   5 ++++-
 7 files changed, 16 insertions(+), 48 deletions(-)

diffs (204 lines):

diff -r 1f8cf08172a1 -r efd34ad0c435 usr.sbin/installboot/arch/alpha.c
--- a/usr.sbin/installboot/arch/alpha.c Tue May 14 06:34:20 2002 +0000
+++ b/usr.sbin/installboot/arch/alpha.c Tue May 14 06:40:32 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: alpha.c,v 1.9 2002/05/14 06:18:52 lukem Exp $  */
+/*     $NetBSD: alpha.c,v 1.10 2002/05/14 06:40:33 lukem Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: alpha.c,v 1.9 2002/05/14 06:18:52 lukem Exp $");
+__RCSID("$NetBSD: alpha.c,v 1.10 2002/05/14 06:40:33 lukem Exp $");
 #endif /* !__lint */
 
 #if HAVE_CONFIG_H
@@ -116,12 +116,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#if HAVE_CONFIG_H
-#include "../../sys/dev/dec/dec_boot.h"
-#else
-#include <dev/dec/dec_boot.h>
-#endif
-
 #include "installboot.h"
 
 #define        SUN_DKMAGIC     55998           /* XXX: from <dev/sun/disklabel.h> */
diff -r 1f8cf08172a1 -r efd34ad0c435 usr.sbin/installboot/arch/pmax.c
--- a/usr.sbin/installboot/arch/pmax.c  Tue May 14 06:34:20 2002 +0000
+++ b/usr.sbin/installboot/arch/pmax.c  Tue May 14 06:40:32 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmax.c,v 1.7 2002/05/14 06:18:52 lukem Exp $   */
+/*     $NetBSD: pmax.c,v 1.8 2002/05/14 06:40:33 lukem Exp $   */
 
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: pmax.c,v 1.7 2002/05/14 06:18:52 lukem Exp $");
+__RCSID("$NetBSD: pmax.c,v 1.8 2002/05/14 06:40:33 lukem Exp $");
 #endif /* !__lint */
 
 #if HAVE_CONFIG_H
@@ -120,11 +120,6 @@
 #include <unistd.h>
 
 #include <sys/exec_elf.h>
-#if HAVE_CONFIG_H
-#include "../../sys/dev/dec/dec_boot.h"
-#else
-#include <dev/dec/dec_boot.h>
-#endif
 
 #include "installboot.h"
 
diff -r 1f8cf08172a1 -r efd34ad0c435 usr.sbin/installboot/arch/sparc.c
--- a/usr.sbin/installboot/arch/sparc.c Tue May 14 06:34:20 2002 +0000
+++ b/usr.sbin/installboot/arch/sparc.c Tue May 14 06:40:32 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sparc.c,v 1.2 2002/05/14 06:18:52 lukem Exp $ */
+/*     $NetBSD: sparc.c,v 1.3 2002/05/14 06:40:33 lukem Exp $ */
 
 /*-
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: sparc.c,v 1.2 2002/05/14 06:18:52 lukem Exp $");
+__RCSID("$NetBSD: sparc.c,v 1.3 2002/05/14 06:40:33 lukem Exp $");
 #endif /* !__lint */
 
 #if HAVE_CONFIG_H
@@ -56,12 +56,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#if HAVE_CONFIG_H
-#include "../../sys/sys/bootblock.h"
-#else
-#include <sys/bootblock.h>
-#endif
-
 #include "installboot.h"
 
 int
diff -r 1f8cf08172a1 -r efd34ad0c435 usr.sbin/installboot/arch/sparc64.c
--- a/usr.sbin/installboot/arch/sparc64.c       Tue May 14 06:34:20 2002 +0000
+++ b/usr.sbin/installboot/arch/sparc64.c       Tue May 14 06:40:32 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sparc64.c,v 1.11 2002/05/14 06:18:52 lukem Exp $       */
+/*     $NetBSD: sparc64.c,v 1.12 2002/05/14 06:40:33 lukem Exp $       */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: sparc64.c,v 1.11 2002/05/14 06:18:52 lukem Exp $");
+__RCSID("$NetBSD: sparc64.c,v 1.12 2002/05/14 06:40:33 lukem Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -80,12 +80,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#if HAVE_CONFIG_H
-#include "../../sys/sys/bootblock.h"
-#else
-#include <sys/bootblock.h>
-#endif
-
 #include "installboot.h"
 
 int
diff -r 1f8cf08172a1 -r efd34ad0c435 usr.sbin/installboot/arch/sun68k.c
--- a/usr.sbin/installboot/arch/sun68k.c        Tue May 14 06:34:20 2002 +0000
+++ b/usr.sbin/installboot/arch/sun68k.c        Tue May 14 06:40:32 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sun68k.c,v 1.12 2002/05/14 06:18:52 lukem Exp $ */
+/*     $NetBSD: sun68k.c,v 1.13 2002/05/14 06:40:33 lukem Exp $ */
 
 /*-
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: sun68k.c,v 1.12 2002/05/14 06:18:52 lukem Exp $");
+__RCSID("$NetBSD: sun68k.c,v 1.13 2002/05/14 06:40:33 lukem Exp $");
 #endif /* !__lint */
 
 #if HAVE_CONFIG_H
@@ -56,12 +56,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#if HAVE_CONFIG_H
-#include "../../sys/sys/bootblock.h"
-#else
-#include <sys/bootblock.h>
-#endif
-
 #include "installboot.h"
 
 int
diff -r 1f8cf08172a1 -r efd34ad0c435 usr.sbin/installboot/arch/vax.c
--- a/usr.sbin/installboot/arch/vax.c   Tue May 14 06:34:20 2002 +0000
+++ b/usr.sbin/installboot/arch/vax.c   Tue May 14 06:40:32 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vax.c,v 1.6 2002/05/14 06:18:52 lukem Exp $    */
+/*     $NetBSD: vax.c,v 1.7 2002/05/14 06:40:33 lukem Exp $    */
 
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: vax.c,v 1.6 2002/05/14 06:18:52 lukem Exp $");
+__RCSID("$NetBSD: vax.c,v 1.7 2002/05/14 06:40:33 lukem Exp $");
 #endif /* !__lint */
 
 #if HAVE_CONFIG_H
@@ -88,12 +88,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#if HAVE_CONFIG_H
-#include "../../sys/dev/dec/dec_boot.h"
-#else
-#include <dev/dec/dec_boot.h>
-#endif
-
 #include "installboot.h"
 
 static int     load_bootstrap(ib_params *, char **,
diff -r 1f8cf08172a1 -r efd34ad0c435 usr.sbin/installboot/installboot.h
--- a/usr.sbin/installboot/installboot.h        Tue May 14 06:34:20 2002 +0000
+++ b/usr.sbin/installboot/installboot.h        Tue May 14 06:40:32 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: installboot.h,v 1.9 2002/05/14 06:18:51 lukem Exp $    */
+/*     $NetBSD: installboot.h,v 1.10 2002/05/14 06:40:32 lukem Exp $   */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -41,6 +41,9 @@
 
 #if HAVE_CONFIG_H
 #include "config.h"
+#include "../../sys/sys/bootblock.h"
+#else
+#include <sys/bootblock.h>
 #endif
 
 typedef enum {

Prev by Date: [src/trunk]: src/usr.sbin/installboot user visible stuff:
Next by Date: [src/trunk]: src/sys Migrate alpha/pmax/vax bootblock stuff from <dev/dec/dec...
Previous by Thread: [src/trunk]: src/usr.sbin/installboot user visible stuff:
Next by Thread: [src/trunk]: src/sys Migrate alpha/pmax/vax bootblock stuff from <dev/dec/dec...
Indexes:

Home | Main Index | Thread Index | Old Index