Date: Mon, 5 Mar 2007 20:33:11 +0200 From: Andrei Kolu <antik@bsd.ee> To: freebsd-geom@freebsd.org Subject: Re: zfs_20070303.patch on current Message-ID: <200703052033.12095.antik@bsd.ee> In-Reply-To: <20070305175619.GC1162@garage.freebsd.pl> References: <20070120073117.GB60202@x12.dk> <200703051952.12024.antik@bsd.ee> <20070305175619.GC1162@garage.freebsd.pl>
next in thread | previous in thread | raw e-mail | index | archive | help
On Monday 05 March 2007 7:56 pm, Pawel Jakub Dawidek wrote:
> On Mon, Mar 05, 2007 at 07:52:11PM +0200, Andrei Kolu wrote:
> > On Monday 05 March 2007 7:27 pm, Pawel Jakub Dawidek wrote:
> > > On Mon, Mar 05, 2007 at 05:27:19PM +0200, Andrei Kolu wrote:
> > > > Stop in /usr/src/cddl/lib.
> > > > *** Error code 1
> > > >
> > > > Stop in /usr/src/cddl.
> > >
> > > Don't patch patched source. The patch is against clean FreeBSD source
> > > from HEAD branch as of 03.03.2007.
> >
> > I am patching clean source from 03.04.2007
> >
> > *default release=cvs tag=.
>
> I'm afraid you don't. cvsup won't remove stuff you have in directories
> not under its control. Try removing the directories below:
>
> contrib/opensolaris
> compat/opensolaris
> sys/contrib/opensolaris
> sys/compat/opensolaris
> cddl
> sys/modules/zfs
>
> And then cvsup, patch, compile.
Oops, I remeber I added empty directories before patch:
#mkdir -p cddl/lib/lib{avl,nvpair,umem,uutil,zfs,zpool}
#mkdir -p cddl/usr.bin/ztest
#mkdir -p cddl/usr.sbin/{zdb,zfs,zpool}
#mkdir -p compat/opensolaris/{include,misc}
#mkdir -p contrib/opensolaris/cmd/{zdb,zfs,zpool,ztest}
#mkdir -p contrib/opensolaris/common/{acl,avl,nvpair,zfs}
#mkdir -p contrib/opensolaris/head
#mkdir -p contrib/opensolaris/lib/libnvpair
#mkdir -p contrib/opensolaris/lib/lib{uutil,zfs}/common
#mkdir -p contrib/opensolaris/lib/libzpool/common/sys
#mkdir -p sys/compat/opensolaris/{kern,machine,rpc,sys}
#mkdir -p sys/contrib/opensolaris/uts/common/fs/zfs/sys
#mkdir -p sys/contrib/opensolaris/uts/common/{os,rpc}
#mkdir -p sys/contrib/opensolaris/uts/common/sys/fm/fs
#mkdir -p sys/contrib/opensolaris/uts/common/sys/fs
#mkdir -p sys/modules/zfs
BUT it gave me another error now:
./lib/libnvpair -lnvpair -L /usr/src/cddl/usr.bin/ztest/../../lib/libavl -lavl -lm -lthr
/usr/bin/ld: cannot find -lumem
*** Error code 1
Stop in /usr/src/cddl/usr.bin/ztest.
*** Error code 1
Stop in /usr/src/cddl/usr.bin.
*** Error code 1
Stop in /usr/src/cddl.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703052033.12095.antik>