From e1fd210e51e8bf04d99f147cd133c779a603f356 Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Mon, 12 Dec 2005 01:14:59 +0000 Subject: [PATCH] Hook XFS into kernel build. --- sys/conf/files | 136 +++++++++++++++++++++++++++++++++++++++++++ sys/conf/kern.pre.mk | 3 + sys/conf/options | 3 + 3 files changed, 142 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index de085eb0eb9..1f75aa60af1 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1877,3 +1877,139 @@ vm/vm_pager.c standard vm/vm_unix.c standard vm/vm_zeroidle.c standard vm/vnode_pager.c standard +# +gnu/fs/xfs/xfs_alloc.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \ + warning "kernel contains GPL contaminated xfs filesystem" +gnu/fs/xfs/xfs_alloc_btree.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_bit.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_bmap.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_bmap_btree.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_btree.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_buf_item.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_da_btree.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_dir.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_dir2.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_dir2_block.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_dir2_data.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_dir2_leaf.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_dir2_node.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_dir2_sf.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_dir2_trace.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_dir_leaf.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_error.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_extfree_item.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_fsops.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_ialloc.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_ialloc_btree.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_inode.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_inode_item.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_iocore.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_itable.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_dfrag.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_log.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_log_recover.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_macros.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_mount.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_rename.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_trans.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_trans_ail.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_trans_buf.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_trans_extfree.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_trans_inode.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_trans_item.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_utils.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_vfsops.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_vnodeops.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_rw.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_attr_leaf.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_attr.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_dmops.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_qmops.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_iget.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_mountops.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_vnops.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_frw.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_buf.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_globals.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_dmistubs.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_super.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_stats.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_vfs.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_vnode.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_sysctl.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_fs_subr.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/xfs_ioctl.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/support/debug.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/support/ktrace.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/support/mrlock.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/support/uuid.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/FreeBSD/support/kmem.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_iomap.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" +gnu/fs/xfs/xfs_behavior.c optional xfs \ + compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 9a8ed23c93d..0fdd246c963 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -75,6 +75,9 @@ INCLUDES+= -I$S/contrib/ngatm # .. and the same for twa INCLUDES+= -I$S/dev/twa +# ... and XFS +INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs + .endif CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} diff --git a/sys/conf/options b/sys/conf/options index e49a89d6e77..43e95142229 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -711,3 +711,6 @@ LOOKUP_SHARED opt_vfs.h # HWPMC options HWPMC_HOOKS + +# XFS +XFS opt_xfs.h