RFT: ZFS MFC

[Dmitry Morozovsky]

On Tue, 19 May 2009, Dimitry Andric wrote:

DA> On 2009-05-19 23:08, Dmitry Morozovsky wrote:
DA> > After cleaning /usr/obj and buildworld in single thread I got
DA> > 
DA> > /usr/src/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/acl.h:35: 
DA> > error: conflicting types for 'aclent_t'
DA> > /usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/uts/common/sys/acl.h:43: 
DA> > error: previous declaration of 'aclent_t' was here
DA> 
DA> You probably didn't use -E with patch, the following files can be
DA> removed manually afterwards:
DA> 
DA> sys/cddl/compat/opensolaris/sys/acl.h
DA> sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S
DA> sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S
DA> sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S
DA> sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S
DA> sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c
DA> sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c
DA> sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c
DA> sys/cddl/contrib/opensolaris/uts/common/sys/vfs.h
DA> sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c
DA> 
DA> My copy is currently still buildworlding, and hasn't failed yet...
DA> 

Well, I'm pretty sure I did use -E, but whatever, I removed them by hand, clean 
up /usr/obj again, and restart buildworld/buildkernel...

...

okie, build went into depend phase, while before it breaks on lib phase. maybe 
I didn't clean someleftovers, or something other go wrong, we'll see...

maybe I left some unusual leftovers in /usr/obj; but again, most of files I had 
to remove by hand (your list) survived ``patch -E''; I'll try to reproduce this 
tomorrow...

... but then again, on `build all'' phase, I got

===> cddl/sbin/zpool (all)
cc -O2 -fno-strict-aliasing -pipe -march=athlon-mp 
-I/usr/src/cddl/sbin/zpool/../../../cddl/contrib/opensolaris/lib/libzpool/common 
-I/usr/src/cddl/sbin/zpool/../../../cddl/compat/opensolaris/include 
-I/usr/src/cddl/sbin/zpool/../../../cddl/compat/opensolaris/lib/libumem 
-I/usr/src/cddl/sbin/zpool/../../../sys/cddl/compat/opensolaris 
-I/usr/src/cddl/sbin/zpool/../../../cddl/contrib/opensolaris/head 
-I/usr/src/cddl/sbin/zpool/../../../cddl/contrib/opensolaris/lib/libuutil/common 
-I/usr/src/cddl/sbin/zpool/../../../cddl/contrib/opensolaris/lib/libumem/common 
-I/usr/src/cddl/sbin/zpool/../../../cddl/contrib/opensolaris/lib/libzfs/common 
-I/usr/src/cddl/sbin/zpool/../../../cddl/contrib/opensolaris/lib/libnvpair 
-I/usr/src/cddl/sbin/zpool/../../../sys/cddl/contrib/opensolaris/common/zfs 
-I/usr/src/cddl/sbin/zpool/../../../sys/cddl/contrib/opensolaris/uts/common 
-I/usr/src/cddl/sbin/zpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs 
-I/usr/src/cddl/sbin/zpool/../../../sys/cddl/contrib/opensolaris/uts/common/sys 
-DNEED_SOLARIS_BOOLEAN -std=gnu89 -Wno-unknown-pragmas  -o zpool zpool_main.o 
zpool_vdev.o zpool_iter.o zpool_util.o -lavl -lzfs -lgeom -lbsdxml -lsbuf  -lm 
-lnvpair -luutil -lutil
zpool_main.o(.text+0x61ff): In function `zpool_do_create':
: undefined reference to `zfs_allocatable_devs'
*** Error code 1

well, time to have abit of sleep to have energy to attack it further ;-)

Thanks again!

-- 
Sincerely,
D.Marck                                     [DM5020, MCK-RIPE, DM3-RIPN]
[ FreeBSD committer:                                 marck at FreeBSD.org ]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck at rinet.ru ***
------------------------------------------------------------------------