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.
2011-07-18 21:51:49 +00:00 · 2011-07-18 21:51:49 +00:00 · f1ca1ce2bf
commit f1ca1ce2bf
parent d97d3aebdc
12 changed files with 72 additions and 24 deletions
--- a/sbin/newfs_v7fs/main.c
+++ b/sbin/newfs_v7fs/main.c
@ -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>
--- a/sys/fs/v7fs/v7fs_datablock.c
+++ b/sys/fs/v7fs/v7fs_datablock.c
@ -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
--- a/sys/fs/v7fs/v7fs_dirent.c
+++ b/sys/fs/v7fs/v7fs_dirent.c
@ -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
--- a/sys/fs/v7fs/v7fs_endian.c
+++ b/sys/fs/v7fs/v7fs_endian.c
@ -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
--- a/sys/fs/v7fs/v7fs_file.c
+++ b/sys/fs/v7fs/v7fs_file.c
@ -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
--- a/sys/fs/v7fs/v7fs_file_util.c
+++ b/sys/fs/v7fs/v7fs_file_util.c
@ -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>
--- a/sys/fs/v7fs/v7fs_inode.c
+++ b/sys/fs/v7fs/v7fs_inode.c
@ -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
--- a/sys/fs/v7fs/v7fs_inode_util.c
+++ b/sys/fs/v7fs/v7fs_inode_util.c
@ -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
--- a/sys/fs/v7fs/v7fs_io.c
+++ b/sys/fs/v7fs/v7fs_io.c
@ -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
--- a/sys/fs/v7fs/v7fs_io_user.c
+++ b/sys/fs/v7fs/v7fs_io_user.c
@ -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>
--- a/sys/fs/v7fs/v7fs_superblock.c
+++ b/sys/fs/v7fs/v7fs_superblock.c
@ -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
--- a/sys/fs/v7fs/v7fs_superblock_util.c
+++ b/sys/fs/v7fs/v7fs_superblock_util.c
@ -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