Next ZFSv28 patchset ready for testing.

[Pawel Jakub Dawidek]

On Mon, Dec 13, 2010 at 10:45:56PM +0100, Pawel Jakub Dawidek wrote:
> Hi.
> 
> The new patchset is ready for testing:
> 
> 	http://people.freebsd.org/~pjd/patches/zfs_20101212.patch.bz2
> 
> When applying the patch be sure to use correct options for patch(1)!:
> 
> 	# cd /usr/src
> 	# fetch http://people.freebsd.org/~pjd/patches/zfs_20101212.patch.bz2
> 	# bzip2 -d zfs_20101212.patch.bz2
> 	# patch -E -p0 < zfs_20101212.patch
[...]

If patch(1) reports reject of sys/cddl/compat/opensolaris/sys/sysmacros.h
file or you see the following error while compiling world:

/usr/src/cddl/usr.bin/ctfconvert/../../../cddl/contrib/opensolaris/tools/ctf/cvt/strtab.c:249: undefined reference to `MIN'
strtab.o(.text+0x28d): In function `strtab_insert':
/usr/src/cddl/usr.bin/ctfconvert/../../../cddl/contrib/opensolaris/tools/ctf/cvt/strtab.c:119: undefined reference to `MIN'
strtab.o(.text+0x3a1):/usr/src/cddl/usr.bin/ctfconvert/../../../cddl/contrib/opensolaris/tools/ctf/cvt/strtab.c:145: undefined reference to `MIN'
*** Error code 1

Simple remove sys/cddl/compat/opensolaris/sys/sysmacros.h file from the tree.

Unfortunately the patch can either works on source downloaded via cvsup or on
the source downloaded via subversion as those two have different $FreeBSD$ id
strings (at least in case of this file). The patch is generated based on
subversion source, so if you use cvsup, you most likely will see the reject and
the error.

-- 
Pawel Jakub Dawidek                       http://www.wheelsystems.com
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: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-fs/attachments/20101213/48036cca/attachment.pgp