Module Name: src
Committed By: apb
Date: Mon Jul 18 21:51:49 UTC 2011
Modified Files:
src/sbin/newfs_v7fs: main.c
src/sys/fs/v7fs: v7fs_datablock.c v7fs_dirent.c v7fs_endian.c
v7fs_file.c v7fs_file_util.c v7fs_inode.c v7fs_inode_util.c
v7fs_io.c v7fs_io_user.c v7fs_superblock.c v7fs_superblock_util.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/newfs_v7fs/main.c
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/v7fs/v7fs_datablock.c
cvs rdiff -u -r1.1 -r1.2 src/sys/fs/v7fs/v7fs_dirent.c \
src/sys/fs/v7fs/v7fs_endian.c src/sys/fs/v7fs/v7fs_file.c \
src/sys/fs/v7fs/v7fs_inode.c src/sys/fs/v7fs/v7fs_inode_util.c \
src/sys/fs/v7fs/v7fs_io.c src/sys/fs/v7fs/v7fs_io_user.c \
src/sys/fs/v7fs/v7fs_superblock.c src/sys/fs/v7fs/v7fs_superblock_util.c
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/v7fs/v7fs_file_util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs_v7fs/main.c
diff -u src/sbin/newfs_v7fs/main.c:1.2 src/sbin/newfs_v7fs/main.c:1.3
--- src/sbin/newfs_v7fs/main.c:1.2 Sun Jul 10 12:14:01 2011
+++ src/sbin/newfs_v7fs/main.c Mon Jul 18 21:51:49 2011
@@ -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>
Index: src/sys/fs/v7fs/v7fs_datablock.c
diff -u src/sys/fs/v7fs/v7fs_datablock.c:1.3 src/sys/fs/v7fs/v7fs_datablock.c:1.4
--- src/sys/fs/v7fs/v7fs_datablock.c:1.3 Sat Jul 16 12:35:32 2011
+++ src/sys/fs/v7fs/v7fs_datablock.c Mon Jul 18 21:51:49 2011
@@ -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
Index: src/sys/fs/v7fs/v7fs_dirent.c
diff -u src/sys/fs/v7fs/v7fs_dirent.c:1.1 src/sys/fs/v7fs/v7fs_dirent.c:1.2
--- src/sys/fs/v7fs/v7fs_dirent.c:1.1 Mon Jun 27 11:52:24 2011
+++ src/sys/fs/v7fs/v7fs_dirent.c Mon Jul 18 21:51:49 2011
@@ -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
Index: src/sys/fs/v7fs/v7fs_endian.c
diff -u src/sys/fs/v7fs/v7fs_endian.c:1.1 src/sys/fs/v7fs/v7fs_endian.c:1.2
--- src/sys/fs/v7fs/v7fs_endian.c:1.1 Mon Jun 27 11:52:24 2011
+++ src/sys/fs/v7fs/v7fs_endian.c Mon Jul 18 21:51:49 2011
@@ -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
Index: src/sys/fs/v7fs/v7fs_file.c
diff -u src/sys/fs/v7fs/v7fs_file.c:1.1 src/sys/fs/v7fs/v7fs_file.c:1.2
--- src/sys/fs/v7fs/v7fs_file.c:1.1 Mon Jun 27 11:52:24 2011
+++ src/sys/fs/v7fs/v7fs_file.c Mon Jul 18 21:51:49 2011
@@ -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
Index: src/sys/fs/v7fs/v7fs_inode.c
diff -u src/sys/fs/v7fs/v7fs_inode.c:1.1 src/sys/fs/v7fs/v7fs_inode.c:1.2
--- src/sys/fs/v7fs/v7fs_inode.c:1.1 Mon Jun 27 11:52:25 2011
+++ src/sys/fs/v7fs/v7fs_inode.c Mon Jul 18 21:51:49 2011
@@ -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
Index: src/sys/fs/v7fs/v7fs_inode_util.c
diff -u src/sys/fs/v7fs/v7fs_inode_util.c:1.1 src/sys/fs/v7fs/v7fs_inode_util.c:1.2
--- src/sys/fs/v7fs/v7fs_inode_util.c:1.1 Mon Jun 27 11:52:25 2011
+++ src/sys/fs/v7fs/v7fs_inode_util.c Mon Jul 18 21:51:49 2011
@@ -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
Index: src/sys/fs/v7fs/v7fs_io.c
diff -u src/sys/fs/v7fs/v7fs_io.c:1.1 src/sys/fs/v7fs/v7fs_io.c:1.2
--- src/sys/fs/v7fs/v7fs_io.c:1.1 Mon Jun 27 11:52:25 2011
+++ src/sys/fs/v7fs/v7fs_io.c Mon Jul 18 21:51:49 2011
@@ -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
Index: src/sys/fs/v7fs/v7fs_io_user.c
diff -u src/sys/fs/v7fs/v7fs_io_user.c:1.1 src/sys/fs/v7fs/v7fs_io_user.c:1.2
--- src/sys/fs/v7fs/v7fs_io_user.c:1.1 Mon Jun 27 11:52:25 2011
+++ src/sys/fs/v7fs/v7fs_io_user.c Mon Jul 18 21:51:49 2011
@@ -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>
Index: src/sys/fs/v7fs/v7fs_superblock.c
diff -u src/sys/fs/v7fs/v7fs_superblock.c:1.1 src/sys/fs/v7fs/v7fs_superblock.c:1.2
--- src/sys/fs/v7fs/v7fs_superblock.c:1.1 Mon Jun 27 11:52:25 2011
+++ src/sys/fs/v7fs/v7fs_superblock.c Mon Jul 18 21:51:49 2011
@@ -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
Index: src/sys/fs/v7fs/v7fs_superblock_util.c
diff -u src/sys/fs/v7fs/v7fs_superblock_util.c:1.1 src/sys/fs/v7fs/v7fs_superblock_util.c:1.2
--- src/sys/fs/v7fs/v7fs_superblock_util.c:1.1 Mon Jun 27 11:52:25 2011
+++ src/sys/fs/v7fs/v7fs_superblock_util.c Mon Jul 18 21:51:49 2011
@@ -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
Index: src/sys/fs/v7fs/v7fs_file_util.c
diff -u src/sys/fs/v7fs/v7fs_file_util.c:1.2 src/sys/fs/v7fs/v7fs_file_util.c:1.3
--- src/sys/fs/v7fs/v7fs_file_util.c:1.2 Sat Jul 16 12:35:40 2011
+++ src/sys/fs/v7fs/v7fs_file_util.c Mon Jul 18 21:51:49 2011
@@ -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>
