On Tue, 19 May 2009, Dimitry Andric wrote: DA> On 2009-05-19 22:10, Dmitry Morozovsky wrote: DA> > Just to be sure: is the patch based on sys/ hierarchy, and does not touch DA> > others (like sbin/)? DA> DA> No, it touches stuff in cddl/ too, so you need to build the world. Be DA> sure to use -E with patch, to cleanup emptied files. E.g.: DA> DA> patch -d /usr/src -p1 -f -F0 -E -i /path/to/zfs-mfc.patch
Hmm, not too much success there: (in the process of building kernel) ===> zfs (all) cc -O2 -fno-strict-aliasing -pipe -march=athlon-mp -DFREEBSD_NAMECACHE -DBUILDING_ZFS -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc -I/usr/src/sys/modules/zfs/../../cddl/compat/opensolaris -I/usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs -I/usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/zmod -I/usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common -I/usr/src/sys/modules/zfs/../.. -I/usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/zfs -I/usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common -I/usr/src/sys/modules/zfs/../../../include -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/MOOSE/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common -g -I/usr/obj/usr/src/sys/MOOSE -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -Wno-unknown-pragmas -Wno-missing-prototypes -Wno-undef -Wno-strict-prototypes -Wno-cast-qual -Wno-parentheses -Wno-redundant-decls -Wno-missing-braces -Wno-uninitialized -Wno-unused -Wno-inline -Wno-switch -Wno-pointer-arith -c /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/acl/acl_common.c In file included from /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/acl/acl_common.h:33, from /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/acl/acl_common.c:36: /usr/src/sys/modules/zfs/../../cddl/compat/opensolaris/sys/acl.h:35: error: conflicting types for 'aclent_t' /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/sys/acl.h:43: error: previous declaration of 'aclent_t' was here /usr/src/sys/modules/zfs/../../cddl/compat/opensolaris/sys/acl.h:40: error: redefinition of 'struct ace' /usr/src/sys/modules/zfs/../../cddl/compat/opensolaris/sys/acl.h:45: error: redefinition of typedef 'ace_t' /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/sys/acl.h:50: error: previous declaration of 'ace_t' was here In file included from /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/acl/acl_common.h:33, from /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/acl/acl_common.c:36: /usr/src/sys/modules/zfs/../../cddl/compat/opensolaris/sys/acl.h:124:1: warning: "ACE_TYPE_FLAGS" redefined [much more after these...] Or, should I rebuild world previously? -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: ma...@freebsd.org ] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- ma...@rinet.ru *** ------------------------------------------------------------------------ _______________________________________________ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"