From owner-freebsd-fs@FreeBSD.ORG Wed Aug 13 21:46:25 2008 Return-Path: Delivered-To: freebsd-fs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 397B91065682 for ; Wed, 13 Aug 2008 21:46:25 +0000 (UTC) (envelope-from matt@corp.spry.com) Received: from wf-out-1314.google.com (wf-out-1314.google.com [209.85.200.172]) by mx1.freebsd.org (Postfix) with ESMTP id 1B5DD8FC21 for ; Wed, 13 Aug 2008 21:46:25 +0000 (UTC) (envelope-from matt@corp.spry.com) Received: by wf-out-1314.google.com with SMTP id 24so142928wfg.7 for ; Wed, 13 Aug 2008 14:46:24 -0700 (PDT) Received: by 10.143.12.20 with SMTP id p20mr134800wfi.301.1218663984527; Wed, 13 Aug 2008 14:46:24 -0700 (PDT) Received: from matt.spry.com ( [207.178.4.6]) by mx.google.com with ESMTPS id 30sm2066838wfg.9.2008.08.13.14.46.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 13 Aug 2008 14:46:23 -0700 (PDT) Message-Id: From: Matt Simerson To: freebsd-fs@freebsd.org In-Reply-To: <20080813111520.7c508734@peedub.jennejohn.org> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v928.1) Date: Wed, 13 Aug 2008 14:46:18 -0700 References: <863C8170-8DCB-4BBD-9E18-CD03D59BC129@corp.spry.com> <20080813111520.7c508734@peedub.jennejohn.org> X-Mailer: Apple Mail (2.928.1) Subject: Re: ZFS patch against todays -HEAD - resolved X-BeenThere: freebsd-fs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Filesystems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Aug 2008 21:46:25 -0000 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 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 >> >> >> > [error messages snip] > > I just applied it using ``patch -p0 -E'' and had no problem building a > kernel. > > --- > Gary Jennejohn