From owner-freebsd-current@FreeBSD.ORG Tue Feb 1 13:13:02 2011 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 62BD31065673 for ; Tue, 1 Feb 2011 13:13:02 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id E69258FC1B for ; Tue, 1 Feb 2011 13:13:01 +0000 (UTC) Received: by fxm16 with SMTP id 16so7042838fxm.13 for ; Tue, 01 Feb 2011 05:13:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:references:date:message-id :user-agent:mime-version:content-type; bh=pnG1KExhg7sKVjjf52RMqoKc+RYJkxnzpgeK61HjCmA=; b=V+pGqyzW88lIfbMM7uz5U6lbmaZypEiS6JCYVW3KoSadY25YmbjchUMP1FbgMvIG+G Nele6IVoMz0F2wq6z2ruY+AvsFFm8w3u4hZ5Jx1rLGklZXSdJEdZFXO8nTAl0eF7d1W7 i0eYkcHiePd+Zh8hy1sd8VKoPeoFrhl8y16OI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:message-id:user-agent :mime-version:content-type; b=mfVp/iWLP+xQbxvRldk9W1DmQziwp1ceD8iyYeU/q3oiZenNNi08TowV5VPvz9gPPE y/uBb8big+3a6M8Prg+gAOSR9OYiLhKCMis0yZpB3OLJntJcXOWjWbKJtjamRj6MbEz9 LT1hmeI6N8Eqi9OWo7F9YuMpAB4/gJLryQQrQ= Received: by 10.223.81.70 with SMTP id w6mr2767729fak.62.1296565980716; Tue, 01 Feb 2011 05:13:00 -0800 (PST) Received: from localhost (gpftor6.privacyfoundation.de [62.212.67.209]) by mx.google.com with ESMTPS id n15sm7839520fam.12.2011.02.01.05.12.55 (version=SSLv3 cipher=RC4-MD5); Tue, 01 Feb 2011 05:12:59 -0800 (PST) From: Anonymous To: Olivier Smedts References: <86k4hkiyr1.fsf@gmail.com> Date: Tue, 01 Feb 2011 16:12:33 +0300 Message-ID: <86wrljuce6.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Cc: FreeBSD-current , Shawn Webb Subject: Re: zpool v28 and -current 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: Tue, 01 Feb 2011 13:13:02 -0000 Olivier Smedts writes: > Hello, > > 2011/1/31 Anonymous : >> Shawn Webb writes: >> >>> I'm having trouble building freebsd-current (sources as of 29 Jan 2011) with >>> the latest zpool v28 patch. `make buildworld` fails. I'd attach a copy of >>> the build log, but it's pretty big. I can put it online on my tech blog if >>> needed. Has anyone else had the same problem? The `uname -a` output of the >>> box in question: >>> >>> FreeBSD beastie 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r218075: Sat Jan 29 >>> 15:14:44 MST 2011 shawn@beastie:/usr/obj/usr/src/sys/GENERIC amd64 >> >> Try below diff-against-diff. I'm using it for weeks with a few p4 commits. >> >> inb4 you're encouraged to wait after 7.4/8.2 are out >> >> %% >> --- zfs_20101212.patch pjd's original >> +++ zfs_20101212.patch sync with r218058 > > Could you send it as an attachment please ? Thanks ! It's not needed, patch(1) is smart enough to ignore junk. $ fetch http://people.freebsd.org/~pjd/patches/zfs_20101212.patch.bz2 $ fetch -o anon_fixup.diff 'http://docs.freebsd.org/cgi/getmsg.cgi?fetch=55203+0+current/freebsd-current+raw' $ bzip2 -d zfs_20101212.patch.bz2 $ patch -si anon_fixup.diff $ cd /usr/src $ patch -Efsp0 -i $OLDPWD/zfs_20101212.patch [ any rejects here are probably because of $FreeBSD: ...$ vs. $FreeBSD$ ] $ make -j5 world kernel DESTDIR=/ Note, some bugs are fixed in pjd_zfs branch. http://p4db.freebsd.org/changeList.cgi?FSPC=//depot/user/pjd/zfs/... My guess, pjd's patch was generated before 186914. So, in order to grab all latest p4 commits in the branch try [...] $ for ci in 186914 186921 186938 186940 186942 186944 186945 \ 187192 187461 187462 187836 187837 187875 187883 188248; do p4diff $ci >>zfs_v28_sync.diff; done $ cd /usr/src $ patch -Efsp0 -i $OLDPWD/zfs_20101212.patch $ patch -Efsp6 -i $OLDPWD/zfs_v28_sync.diff [...] %% #! /bin/sh # p4diff - a dumb way to grab diffs from perforce cgi getopts s: opt shift $((OPTIND - 1)) usage="usage: ${0##*/} [-s servaddr] ex.: ${0##*/} 187192" ch=${1:?$usage} serv=${OPTARG:-perforce.freebsd.org} fetch -qo- "http://$serv/changeView.cgi?CH=$ch" | sed -n "s|.*fileLogView\.cgi[^>]*>\([^<]*\)<.*|\1|p s|.*fileViewer\([^\"]*\).*|http://$serv/fileDownLoad\1|p" | while read currlink; do rev=${currlink##*REV=} prevlink=${currlink%%REV=*}REV=$((rev-1)) fetch -qo${prevfile:=$(mktemp -t p4diff)} "$prevlink" sleep 1 fetch -qo${currfile:=$(mktemp -t p4diff)} "$currlink" read filename diff -u $prevfile $currfile | sed "s?$prevfile.*?$filename $((ch-1))? s?$currfile.*?$filename $ch?" rm -f $prevfile $currfile done %%