zfs_20070303.patch on current

[Pawel Jakub Dawidek]

On Mon, Mar 05, 2007 at 05:27:19PM +0200, Andrei Kolu wrote:
> Hello! 
> 
> I am trying to patch my 7.0-CURRENT #1: Mon Mar  5 02:44:36 EET 2007 with ZFS 
> patch. zfs_20070303.patch
> 
> It gave me an error when compiling kernel:
> 
> /usr/src/sys/modules/zfs/../../contrib/opensolaris/uts/common/zfs/vdev_geom.c
> cc1: error: -I- specified twice
> ....
> cc1: error: -I- specified twice
> mkdep: compile failed
> *** Error code 1
> 
> Stop in /usr/src/sys/modules/zfs.
> *** Error code 1
> 
> Stop in /usr/src/sys/modules.
> *** Error code 1
> 
> Stop in /usr/obj/usr/src/sys/MYCURRENT.
> *** Error code 1
> 
> Stop in /usr/src.
> *** Error code 1
> 
> Stop in /usr/src.
> "/usr/share/mk/bsd.subdir.mk", line 57: warning: duplicate script for 
> target "_SUBDIR" ignored
> .....
> /usr/src/cddl/lib/libavl/../../../contrib/opensolaris/common/avl/avl.c:879: 
> error: previous definit of 'avl_destroy_nodes' was here
> *** Error code 1
> 
> Stop in /usr/src/cddl/lib/libavl.
> *** Error code 1
> 
> 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.

-- 
Pawel Jakub Dawidek                       http://www.wheel.pl
pjd at FreeBSD.org                           http://www.FreeBSD.org
FreeBSD committer                         Am I Evil? Yes, I Am!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-geom/attachments/20070305/6e8488f3/attachment.pgp