Date: Mon, 13 Dec 2010 23:45:30 +0100 From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: freebsd-fs@FreeBSD.org Cc: freebsd-current@FreeBSD.org Subject: Re: Next ZFSv28 patchset ready for testing. Message-ID: <20101213224530.GI2038@garage.freebsd.pl> In-Reply-To: <20101213214556.GC2038@garage.freebsd.pl> References: <20101213214556.GC2038@garage.freebsd.pl>
next in thread | previous in thread | raw e-mail | index | archive | help
--Q59ABw34pTSIagmi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Dec 13, 2010 at 10:45:56PM +0100, Pawel Jakub Dawidek wrote: > Hi. >=20 > The new patchset is ready for testing: >=20 > http://people.freebsd.org/~pjd/patches/zfs_20101212.patch.bz2 >=20 > When applying the patch be sure to use correct options for patch(1)!: >=20 > # 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/ct= f/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/ct= f/cvt/strtab.c:119: undefined reference to `MIN' strtab.o(.text+0x3a1):/usr/src/cddl/usr.bin/ctfconvert/../../../cddl/contri= b/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 tre= e. 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. --=20 Pawel Jakub Dawidek http://www.wheelsystems.com pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --Q59ABw34pTSIagmi Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAk0GogoACgkQForvXbEpPzRlwwCfZA/DRfA+IbHCO/TN+fsUs43r FzkAn1fl84RQuuZ7QMM6nsBCuLSeJ8r8 =LoRe -----END PGP SIGNATURE----- --Q59ABw34pTSIagmi--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101213224530.GI2038>