Date: Mon, 5 Mar 2007 18:56:19 +0100 From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: Andrei Kolu <antik@bsd.ee> Cc: freebsd-geom@freebsd.org Subject: Re: zfs_20070303.patch on current Message-ID: <20070305175619.GC1162@garage.freebsd.pl> In-Reply-To: <200703051952.12024.antik@bsd.ee> References: <20070120073117.GB60202@x12.dk> <200703051727.19990.antik@bsd.ee> <20070305172731.GA1162@garage.freebsd.pl> <200703051952.12024.antik@bsd.ee>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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. -- Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFF7FnDForvXbEpPzQRAgkfAKCEp1fmKIyjGidLE1W+7rFA71E55QCbBxeq JgnVlAI3mx9TXaDVWfiZVuA= =NnZh -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070305175619.GC1162>