From owner-freebsd-current@FreeBSD.ORG Mon Dec 13 22:45:41 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EAA72106564A; Mon, 13 Dec 2010 22:45:40 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (60.wheelsystems.com [83.12.187.60]) by mx1.freebsd.org (Postfix) with ESMTP id 911E98FC17; Mon, 13 Dec 2010 22:45:40 +0000 (UTC) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id E160245E8E; Mon, 13 Dec 2010 23:45:38 +0100 (CET) Received: from localhost (89-73-192-49.dynamic.chello.pl [89.73.192.49]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id CC87045DF4; Mon, 13 Dec 2010 23:45:33 +0100 (CET) Date: Mon, 13 Dec 2010 23:45:30 +0100 From: Pawel Jakub Dawidek To: freebsd-fs@FreeBSD.org Message-ID: <20101213224530.GI2038@garage.freebsd.pl> References: <20101213214556.GC2038@garage.freebsd.pl> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Q59ABw34pTSIagmi" Content-Disposition: inline In-Reply-To: <20101213214556.GC2038@garage.freebsd.pl> User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 9.0-CURRENT amd64 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-0.6 required=4.5 tests=BAYES_00,RCVD_IN_SORBS_DUL autolearn=no version=3.0.4 Cc: freebsd-current@FreeBSD.org Subject: Re: Next ZFSv28 patchset ready for testing. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Dec 2010 22:45:41 -0000 --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--