[src/trunk]: src In sources that get compiled into the tools version of makef...

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

details:   https://anonhg.NetBSD.org/src/rev/6d52c6961c81
branches:  trunk
changeset: 767454:6d52c6961c81
user:      apb <apb%NetBSD.org@localhost>
date:      Mon Jul 18 21:51:49 2011 +0000

description:
In sources that get compiled into the tools version of makefs, add:

#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif

This should fix cross-build problems, but I can't really test
that now, so I am not re-enabling the inclusion of v7fs support
in makefs.

diffstat:

 sbin/newfs_v7fs/main.c             |  8 ++++++--
 sys/fs/v7fs/v7fs_datablock.c       |  8 ++++++--
 sys/fs/v7fs/v7fs_dirent.c          |  8 ++++++--
 sys/fs/v7fs/v7fs_endian.c          |  8 ++++++--
 sys/fs/v7fs/v7fs_file.c            |  8 ++++++--
 sys/fs/v7fs/v7fs_file_util.c       |  8 ++++++--
 sys/fs/v7fs/v7fs_inode.c           |  8 ++++++--
 sys/fs/v7fs/v7fs_inode_util.c      |  8 ++++++--
 sys/fs/v7fs/v7fs_io.c              |  8 ++++++--
 sys/fs/v7fs/v7fs_io_user.c         |  8 ++++++--
 sys/fs/v7fs/v7fs_superblock.c      |  8 ++++++--
 sys/fs/v7fs/v7fs_superblock_util.c |  8 ++++++--
 12 files changed, 72 insertions(+), 24 deletions(-)

diffs (278 lines):

diff -r 4cb2033104cf -r 6d52c6961c81 sbin/newfs_v7fs/main.c
--- a/sbin/newfs_v7fs/main.c    Mon Jul 18 21:51:06 2011 +0000
+++ b/sbin/newfs_v7fs/main.c    Mon Jul 18 21:51:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.2 2011/07/10 12:14:01 uch Exp $     */
+/*     $NetBSD: main.c,v 1.3 2011/07/18 21:51:49 apb Exp $     */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,9 +29,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.2 2011/07/10 12:14:01 uch Exp $");
+__RCSID("$NetBSD: main.c,v 1.3 2011/07/18 21:51:49 apb Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
diff -r 4cb2033104cf -r 6d52c6961c81 sys/fs/v7fs/v7fs_datablock.c
--- a/sys/fs/v7fs/v7fs_datablock.c      Mon Jul 18 21:51:06 2011 +0000
+++ b/sys/fs/v7fs/v7fs_datablock.c      Mon Jul 18 21:51:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: v7fs_datablock.c,v 1.3 2011/07/16 12:35:32 uch Exp $   */
+/*     $NetBSD: v7fs_datablock.c,v 1.4 2011/07/18 21:51:49 apb Exp $   */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,8 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_datablock.c,v 1.3 2011/07/16 12:35:32 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_datablock.c,v 1.4 2011/07/18 21:51:49 apb Exp $");
 #if defined _KERNEL_OPT
 #include "opt_v7fs.h"
 #endif
diff -r 4cb2033104cf -r 6d52c6961c81 sys/fs/v7fs/v7fs_dirent.c
--- a/sys/fs/v7fs/v7fs_dirent.c Mon Jul 18 21:51:06 2011 +0000
+++ b/sys/fs/v7fs/v7fs_dirent.c Mon Jul 18 21:51:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: v7fs_dirent.c,v 1.1 2011/06/27 11:52:24 uch Exp $      */
+/*     $NetBSD: v7fs_dirent.c,v 1.2 2011/07/18 21:51:49 apb Exp $      */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,8 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_dirent.c,v 1.1 2011/06/27 11:52:24 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_dirent.c,v 1.2 2011/07/18 21:51:49 apb Exp $");
 #if defined _KERNEL_OPT
 #include "opt_v7fs.h"
 #endif
diff -r 4cb2033104cf -r 6d52c6961c81 sys/fs/v7fs/v7fs_endian.c
--- a/sys/fs/v7fs/v7fs_endian.c Mon Jul 18 21:51:06 2011 +0000
+++ b/sys/fs/v7fs/v7fs_endian.c Mon Jul 18 21:51:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: v7fs_endian.c,v 1.1 2011/06/27 11:52:24 uch Exp $      */
+/*     $NetBSD: v7fs_endian.c,v 1.2 2011/07/18 21:51:49 apb Exp $      */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,8 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_endian.c,v 1.1 2011/06/27 11:52:24 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_endian.c,v 1.2 2011/07/18 21:51:49 apb Exp $");
 #if defined _KERNEL_OPT
 #include "opt_v7fs.h"
 #endif
diff -r 4cb2033104cf -r 6d52c6961c81 sys/fs/v7fs/v7fs_file.c
--- a/sys/fs/v7fs/v7fs_file.c   Mon Jul 18 21:51:06 2011 +0000
+++ b/sys/fs/v7fs/v7fs_file.c   Mon Jul 18 21:51:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: v7fs_file.c,v 1.1 2011/06/27 11:52:24 uch Exp $        */
+/*     $NetBSD: v7fs_file.c,v 1.2 2011/07/18 21:51:49 apb Exp $        */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,8 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_file.c,v 1.1 2011/06/27 11:52:24 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_file.c,v 1.2 2011/07/18 21:51:49 apb Exp $");
 #if defined _KERNEL_OPT
 #include "opt_v7fs.h"
 #endif
diff -r 4cb2033104cf -r 6d52c6961c81 sys/fs/v7fs/v7fs_file_util.c
--- a/sys/fs/v7fs/v7fs_file_util.c      Mon Jul 18 21:51:06 2011 +0000
+++ b/sys/fs/v7fs/v7fs_file_util.c      Mon Jul 18 21:51:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: v7fs_file_util.c,v 1.2 2011/07/16 12:35:40 uch Exp $   */
+/*     $NetBSD: v7fs_file_util.c,v 1.3 2011/07/18 21:51:49 apb Exp $   */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,8 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_file_util.c,v 1.2 2011/07/16 12:35:40 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_file_util.c,v 1.3 2011/07/18 21:51:49 apb Exp $");
 #ifdef _KERNEL
 #include <sys/systm.h>
 #include <sys/param.h>
diff -r 4cb2033104cf -r 6d52c6961c81 sys/fs/v7fs/v7fs_inode.c
--- a/sys/fs/v7fs/v7fs_inode.c  Mon Jul 18 21:51:06 2011 +0000
+++ b/sys/fs/v7fs/v7fs_inode.c  Mon Jul 18 21:51:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: v7fs_inode.c,v 1.1 2011/06/27 11:52:25 uch Exp $       */
+/*     $NetBSD: v7fs_inode.c,v 1.2 2011/07/18 21:51:49 apb Exp $       */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,8 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_inode.c,v 1.1 2011/06/27 11:52:25 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_inode.c,v 1.2 2011/07/18 21:51:49 apb Exp $");
 #if defined _KERNEL_OPT
 #include "opt_v7fs.h"
 #endif
diff -r 4cb2033104cf -r 6d52c6961c81 sys/fs/v7fs/v7fs_inode_util.c
--- a/sys/fs/v7fs/v7fs_inode_util.c     Mon Jul 18 21:51:06 2011 +0000
+++ b/sys/fs/v7fs/v7fs_inode_util.c     Mon Jul 18 21:51:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: v7fs_inode_util.c,v 1.1 2011/06/27 11:52:25 uch Exp $  */
+/*     $NetBSD: v7fs_inode_util.c,v 1.2 2011/07/18 21:51:49 apb Exp $  */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,8 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_inode_util.c,v 1.1 2011/06/27 11:52:25 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_inode_util.c,v 1.2 2011/07/18 21:51:49 apb Exp $");
 #if defined _KERNEL_OPT
 #include "opt_v7fs.h"
 #endif
diff -r 4cb2033104cf -r 6d52c6961c81 sys/fs/v7fs/v7fs_io.c
--- a/sys/fs/v7fs/v7fs_io.c     Mon Jul 18 21:51:06 2011 +0000
+++ b/sys/fs/v7fs/v7fs_io.c     Mon Jul 18 21:51:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: v7fs_io.c,v 1.1 2011/06/27 11:52:25 uch Exp $  */
+/*     $NetBSD: v7fs_io.c,v 1.2 2011/07/18 21:51:49 apb Exp $  */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,8 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_io.c,v 1.1 2011/06/27 11:52:25 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_io.c,v 1.2 2011/07/18 21:51:49 apb Exp $");
 #if defined _KERNEL_OPT
 #include "opt_v7fs.h"
 #endif
diff -r 4cb2033104cf -r 6d52c6961c81 sys/fs/v7fs/v7fs_io_user.c
--- a/sys/fs/v7fs/v7fs_io_user.c        Mon Jul 18 21:51:06 2011 +0000
+++ b/sys/fs/v7fs/v7fs_io_user.c        Mon Jul 18 21:51:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: v7fs_io_user.c,v 1.1 2011/06/27 11:52:25 uch Exp $     */
+/*     $NetBSD: v7fs_io_user.c,v 1.2 2011/07/18 21:51:49 apb Exp $     */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,9 +29,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: v7fs_io_user.c,v 1.1 2011/06/27 11:52:25 uch Exp $");
+__RCSID("$NetBSD: v7fs_io_user.c,v 1.2 2011/07/18 21:51:49 apb Exp $");
 #endif /* not lint */
 
 #include <stdio.h>
diff -r 4cb2033104cf -r 6d52c6961c81 sys/fs/v7fs/v7fs_superblock.c
--- a/sys/fs/v7fs/v7fs_superblock.c     Mon Jul 18 21:51:06 2011 +0000
+++ b/sys/fs/v7fs/v7fs_superblock.c     Mon Jul 18 21:51:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: v7fs_superblock.c,v 1.1 2011/06/27 11:52:25 uch Exp $  */
+/*     $NetBSD: v7fs_superblock.c,v 1.2 2011/07/18 21:51:49 apb Exp $  */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,8 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_superblock.c,v 1.1 2011/06/27 11:52:25 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_superblock.c,v 1.2 2011/07/18 21:51:49 apb Exp $");
 #if defined _KERNEL_OPT
 #include "opt_v7fs.h"
 #endif
diff -r 4cb2033104cf -r 6d52c6961c81 sys/fs/v7fs/v7fs_superblock_util.c
--- a/sys/fs/v7fs/v7fs_superblock_util.c        Mon Jul 18 21:51:06 2011 +0000
+++ b/sys/fs/v7fs/v7fs_superblock_util.c        Mon Jul 18 21:51:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: v7fs_superblock_util.c,v 1.1 2011/06/27 11:52:25 uch Exp $     */
+/*     $NetBSD: v7fs_superblock_util.c,v 1.2 2011/07/18 21:51:49 apb Exp $     */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,8 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_superblock_util.c,v 1.1 2011/06/27 11:52:25 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_superblock_util.c,v 1.2 2011/07/18 21:51:49 apb Exp $");
 #if defined _KERNEL_OPT
 #include "opt_v7fs.h"
 #endif