[src/trunk]: src Tidy up the LFS userland build hacks.

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

details:   https://anonhg.NetBSD.org/src/rev/184145cf6885
branches:  trunk
changeset: 787246:184145cf6885
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sat Jun 08 02:16:03 2013 +0000

description:
Tidy up the LFS userland build hacks.
Don't use -I${NETBSDSRCDIR}/sys; don't include files other than the
exported LFS headers, which are lfs.h, lfs_inode.h, and (for now)
lfs_extern.h.

diffstat:

 libexec/lfs_cleanerd/Makefile |   5 +----
 sbin/fsck_lfs/Makefile        |   5 +----
 sbin/fsck_lfs/dir.c           |   6 ++----
 sbin/fsck_lfs/inode.c         |   6 ++----
 sbin/fsck_lfs/lfs.c           |   6 ++----
 sbin/fsck_lfs/main.c          |   4 +---
 sbin/fsck_lfs/pass0.c         |   6 ++----
 sbin/fsck_lfs/pass1.c         |   6 ++----
 sbin/fsck_lfs/pass2.c         |   5 ++---
 sbin/fsck_lfs/pass3.c         |   3 +--
 sbin/fsck_lfs/pass4.c         |   5 ++---
 sbin/fsck_lfs/pass5.c         |   7 ++-----
 sbin/fsck_lfs/pass6.c         |   7 ++-----
 sbin/fsck_lfs/segwrite.c      |   6 ++----
 sbin/fsck_lfs/setup.c         |   6 ++----
 sbin/fsck_lfs/utilities.c     |   4 +---
 sbin/fsck_lfs/vars.c          |   4 +---
 sbin/fsck_lfs/vnode.c         |   6 ++----
 sbin/newfs_lfs/Makefile       |   5 +----
 sbin/newfs_lfs/make_lfs.c     |  11 ++++-------
 sbin/newfs_lfs/newfs.c        |   6 ++----
 sys/ufs/lfs/lfs_itimes.c      |   9 ++++-----
 22 files changed, 41 insertions(+), 87 deletions(-)

diffs (truncated from 502 to 300 lines):

diff -r a78d40c08444 -r 184145cf6885 libexec/lfs_cleanerd/Makefile
--- a/libexec/lfs_cleanerd/Makefile     Sat Jun 08 02:15:12 2013 +0000
+++ b/libexec/lfs_cleanerd/Makefile     Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2013/06/06 00:54:49 dholland Exp $
+#      $NetBSD: Makefile,v 1.17 2013/06/08 02:16:03 dholland Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/18/93
 
 .include "Makefile.inc"
@@ -6,9 +6,6 @@
 PROG=  lfs_cleanerd
 MAN=   lfs_cleanerd.8
 
-# XXX
-CPPFLAGS+=-I${NETBSDSRCDIR}/sys
-
 BINDIR=                /libexec
 .if (${MKDYNAMICROOT} == "no")
 LDSTATIC?=      -static
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/Makefile
--- a/sbin/fsck_lfs/Makefile    Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/Makefile    Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2013/06/06 00:54:49 dholland Exp $
+#      $NetBSD: Makefile,v 1.19 2013/06/08 02:16:03 dholland Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 
 WARNS?=        3       # XXX: sign-compare issues
@@ -17,9 +17,6 @@
 CPPFLAGS+="-DKASSERT(x)="
 # -DVERBOSE_BLOCKMAP 
 
-# XXX
-CPPFLAGS+=-I${NETBSDSRCDIR}/sys
-
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
 
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/dir.c
--- a/sbin/fsck_lfs/dir.c       Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/dir.c       Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.30 2013/06/08 02:14:46 dholland Exp $     */
+/* $NetBSD: dir.c,v 1.31 2013/06/08 02:16:03 dholland Exp $     */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -35,10 +35,8 @@
 #include <sys/buf.h>
 #include <sys/mount.h>
 
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
-#include <ufs/lfs/ulfsmount.h>
 #include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
 
 #include <err.h>
 #include <stdio.h>
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/inode.c
--- a/sbin/fsck_lfs/inode.c     Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/inode.c     Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.c,v 1.49 2013/06/08 02:14:46 dholland Exp $   */
+/* $NetBSD: inode.c,v 1.50 2013/06/08 02:16:03 dholland Exp $   */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,10 +65,8 @@
 #include <sys/mount.h>
 
 #define vnode uvnode
-#define _SYS_VNODE_H_ /* XXX */
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
 #include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
 #undef vnode
 
 #include <err.h>
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/lfs.c
--- a/sbin/fsck_lfs/lfs.c       Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/lfs.c       Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.38 2013/06/06 00:54:49 dholland Exp $ */
+/* $NetBSD: lfs.c,v 1.39 2013/06/08 02:16:03 dholland Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -71,10 +71,8 @@
 #include <sys/mount.h>
 
 #define vnode uvnode
-#define _SYS_VNODE_H_ /* XXX */
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfsmount.h>
 #include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
 #undef vnode
 
 #include <assert.h>
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/main.c
--- a/sbin/fsck_lfs/main.c      Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/main.c      Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.44 2013/06/06 00:52:50 dholland Exp $    */
+/* $NetBSD: main.c,v 1.45 2013/06/08 02:16:03 dholland Exp $    */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -32,8 +32,6 @@
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/mount.h>
-#include <ufs/lfs/ulfs_dinode.h>
-#include <ufs/lfs/ulfsmount.h>
 #include <ufs/lfs/lfs.h>
 
 #include <fstab.h>
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/pass0.c
--- a/sbin/fsck_lfs/pass0.c     Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/pass0.c     Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass0.c,v 1.34 2013/06/06 00:54:49 dholland Exp $   */
+/* $NetBSD: pass0.c,v 1.35 2013/06/08 02:16:03 dholland Exp $   */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -64,10 +64,8 @@
 #include <sys/mount.h>
 
 #define vnode uvnode
-#define _SYS_VNODE_H_ /* XXX */
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
 #include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
 #undef vnode
 
 #include <assert.h>
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/pass1.c
--- a/sbin/fsck_lfs/pass1.c     Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/pass1.c     Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass1.c,v 1.35 2013/06/08 02:14:46 dholland Exp $   */
+/* $NetBSD: pass1.c,v 1.36 2013/06/08 02:16:03 dholland Exp $   */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -35,10 +35,8 @@
 #include <sys/buf.h>
 
 #define vnode uvnode
-#define _SYS_VNODE_H_ /* XXX */
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
 #include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
 #undef vnode
 
 #include <err.h>
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/pass2.c
--- a/sbin/fsck_lfs/pass2.c     Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/pass2.c     Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass2.c,v 1.22 2013/06/08 02:14:46 dholland Exp $   */
+/* $NetBSD: pass2.c,v 1.23 2013/06/08 02:16:03 dholland Exp $   */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -35,9 +35,8 @@
 #include <sys/mount.h>
 #include <sys/buf.h>
 
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
 #include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
 
 #include <err.h>
 #include <stdio.h>
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/pass3.c
--- a/sbin/fsck_lfs/pass3.c     Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/pass3.c     Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass3.c,v 1.12 2013/06/06 00:54:49 dholland Exp $   */
+/* $NetBSD: pass3.c,v 1.13 2013/06/08 02:16:03 dholland Exp $   */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -32,7 +32,6 @@
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/mount.h>
-#include <ufs/lfs/ulfs_dinode.h>
 #include <ufs/lfs/lfs.h>
 #include "fsck.h"
 #include "extern.h"
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/pass4.c
--- a/sbin/fsck_lfs/pass4.c     Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/pass4.c     Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass4.c,v 1.20 2013/06/06 00:54:49 dholland Exp $   */
+/* $NetBSD: pass4.c,v 1.21 2013/06/08 02:16:03 dholland Exp $   */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -33,12 +33,11 @@
 #include <sys/time.h>
 #include <sys/mount.h>
 
-#define _SYS_VNODE_H_ /* XXX */
 #define vnode uvnode
 #define buf ubuf
 #define panic call_panic
-#include <ufs/lfs/ulfs_inode.h>
 #include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
 
 #include <err.h>
 #include <stdlib.h>
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/pass5.c
--- a/sbin/fsck_lfs/pass5.c     Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/pass5.c     Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass5.c,v 1.26 2013/06/06 00:54:49 dholland Exp $   */
+/* $NetBSD: pass5.c,v 1.27 2013/06/08 02:16:03 dholland Exp $   */
 
 /*-
  * Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -35,12 +35,9 @@
 #include <sys/buf.h>
 #include <sys/mount.h>
 
-#define _SYS_VNODE_H_ /* XXX */
 #define vnode uvnode
-#include <ufs/lfs/ulfsmount.h>
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
 #include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
 #undef vnode
 
 #include <string.h>
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/pass6.c
--- a/sbin/fsck_lfs/pass6.c     Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/pass6.c     Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass6.c,v 1.28 2013/06/08 02:09:35 dholland Exp $   */
+/* $NetBSD: pass6.c,v 1.29 2013/06/08 02:16:03 dholland Exp $   */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -35,13 +35,10 @@
 #include <sys/buf.h>
 #include <sys/mount.h>
 
-#define _SYS_VNODE_H_ /* XXX */
 #define VU_DIROP 0x01000000 /* XXX XXX from sys/vnode.h */
 #define vnode uvnode
-#include <ufs/lfs/ulfsmount.h>
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
 #include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
 #undef vnode
 
 #include <assert.h>
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/segwrite.c
--- a/sbin/fsck_lfs/segwrite.c  Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/segwrite.c  Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: segwrite.c,v 1.24 2013/06/08 02:09:35 dholland Exp $ */
+/* $NetBSD: segwrite.c,v 1.25 2013/06/08 02:16:03 dholland Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -68,15 +68,13 @@
 #include <sys/mount.h>
 
 /* Override certain things to make <ufs/lfs/lfs.h> work */
-#define _SYS_VNODE_H_ /* XXX */
 #define VU_DIROP 0x01000000 /* XXX XXX from sys/vnode.h */
 #define vnode uvnode
 #define buf ubuf
 #define panic call_panic
 
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfsmount.h>
 #include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
 
 #include <assert.h>
 #include <stdio.h>
diff -r a78d40c08444 -r 184145cf6885 sbin/fsck_lfs/setup.c
--- a/sbin/fsck_lfs/setup.c     Sat Jun 08 02:15:12 2013 +0000
+++ b/sbin/fsck_lfs/setup.c     Sat Jun 08 02:16:03 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.42 2013/06/08 02:09:35 dholland Exp $ */
+/* $NetBSD: setup.c,v 1.43 2013/06/08 02:16:03 dholland Exp $ */