Date: Wed, 13 Aug 2008 14:46:18 -0700 From: Matt Simerson <matt@corp.spry.com> To: freebsd-fs@freebsd.org Subject: Re: ZFS patch against todays -HEAD - resolved Message-ID: <C5BBDC46-2F31-4717-BD94-F0A09DEA59D2@corp.spry.com> In-Reply-To: <20080813111520.7c508734@peedub.jennejohn.org> References: <863C8170-8DCB-4BBD-9E18-CD03D59BC129@corp.spry.com> <20080813111520.7c508734@peedub.jennejohn.org>
next in thread | previous in thread | raw e-mail | index | archive | help
When I do a cvsup of -HEAD, cvs checks out many of the patched files anew but not all of them. In this case, it was several files, including sys/kern/kern_osd.c which had the contents of itself duplicated a number of times, explaining the duplicate definition errors. The quantify of duplicated contents corresponded with the number of times I had run the patch -p0 command. So, to get a kernel built with the patch applied, I needed to: cd /usr/src rm -rf kern cddl sys/cddl sys/kern cvsup /usr/local/etc/cvsup-head patch -p0 -E < ~matt/zfs/zfs_20080727.patch make buildkernel Matt On Aug 13, 2008, at 2:15 AM, Gary Jennejohn wrote: > On Tue, 12 Aug 2008 16:58:04 -0700 > Matt Simerson <matt@corp.spry.com> wrote: > >> I applied the ZFS patch from http://people.freebsd.org/~pjd/patches/zfs_20080727.patch.bz2 >> to a copy of -HEAD checked out today and it fails as shown below. >> >> Any pointers on what needs to be tweaked to get past that? >> >> Matt >> >> cvsup /usr/local/etc/cvsup-head >> cd /usr/src >> patch -p0 < ~matt/zfs/zfs_20080727.patch >> rm /usr/src/sys/cddl/compat/opensolaris/sys/acl.h >> rm /usr/src/sys/cddl/compat/opensolaris/sys/callb.h >> cd /usr/src && make buildkernel >> >> <snip> >> > [error messages snip] > > I just applied it using ``patch -p0 -E'' and had no problem building a > kernel. > > --- > Gary Jennejohn
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?C5BBDC46-2F31-4717-BD94-F0A09DEA59D2>