Date: Tue, 1 Feb 2011 15:11:23 +0100 From: Olivier Smedts <olivier@gid0.org> To: Anonymous <swell.k@gmail.com> Cc: FreeBSD-current <freebsd-current@freebsd.org>, Shawn Webb <lattera@gmail.com> Subject: Re: zpool v28 and -current Message-ID: <AANLkTikrCP%2BU07673i=OM-vmdMGiB_Rv73k4U_pLFA%2Bw@mail.gmail.com> In-Reply-To: <86wrljuce6.fsf@gmail.com> References: <AANLkTikM0S3aovnk0WQikC%2BC130DW7M4Nv6kDp%2BRCfGj@mail.gmail.com> <86k4hkiyr1.fsf@gmail.com> <AANLkTikAhuaeo3Z1O28ihBucafyJnpPiriwqs9v9Hsrv@mail.gmail.com> <86wrljuce6.fsf@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
2011/2/1 Anonymous <swell.k@gmail.com>: > Olivier Smedts <olivier@gid0.org> writes: > >> Hello, >> >> 2011/1/31 Anonymous <swell.k@gmail.com>: >>> Shawn Webb <lattera@gmail.com> 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 blo= g 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 =A0 shawn@beastie:/usr/obj/usr/src/sys/GENERIC amd64 >>> >>> Try below diff-against-diff. I'm using it for weeks with a few p4 commi= ts. >>> >>> inb4 you're encouraged to wait after 7.4/8.2 are out >>> >>> %% >>> --- zfs_20101212.patch =A0 =A0 pjd's original >>> +++ zfs_20101212.patch =A0 =A0 sync with r218058 >> >> Could you send it as an attachment please ? Thanks ! > > It's not needed, patch(1) is smart enough to ignore junk. > > =A0$ fetch http://people.freebsd.org/~pjd/patches/zfs_20101212.patch.bz2 > =A0$ fetch -o anon_fixup.diff 'http://docs.freebsd.org/cgi/getmsg.cgi?fet= ch=3D55203+0+current/freebsd-current+raw' > =A0$ bzip2 -d zfs_20101212.patch.bz2 > =A0$ patch -si anon_fixup.diff > =A0$ cd /usr/src > =A0$ patch -Efsp0 -i $OLDPWD/zfs_20101212.patch > =A0[ any rejects here are probably because of $FreeBSD: ...$ vs. $FreeBSD= $ ] No problem with latest HEAD (r218166) through SVN. > =A0$ make -j5 world kernel DESTDIR=3D/ > > Note, some bugs are fixed in pjd_zfs branch. > > =A0http://p4db.freebsd.org/changeList.cgi?FSPC=3D//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 > > =A0[...] > =A0$ for ci in 186914 186921 186938 186940 186942 186944 186945 \ > =A0 =A0 =A0187192 187461 187462 187836 187837 187875 187883 188248; do > =A0 =A0 =A0 =A0p4diff $ci >>zfs_v28_sync.diff; done > =A0$ cd /usr/src > =A0$ patch -Efsp0 -i $OLDPWD/zfs_20101212.patch > =A0$ patch -Efsp6 -i $OLDPWD/zfs_v28_sync.diff > =A0[...] Much thanks for the procedure. And without using ports/devel/p4... wow ! Testing right now. Cheers > %% > #! /bin/sh > # p4diff - a dumb way to grab diffs from perforce cgi > > getopts s: opt > shift $((OPTIND - 1)) > > usage=3D"usage: ${0##*/} [-s servaddr] <change#> > ex.: =A0 ${0##*/} 187192" > ch=3D${1:?$usage} > serv=3D${OPTARG:-perforce.freebsd.org} > > fetch -qo- "http://$serv/changeView.cgi?CH=3D$ch" | > sed -n "s|.*fileLogView\.cgi[^>]*>\([^<]*\)<.*|\1|p > =A0 =A0 =A0 =A0s|.*fileViewer\([^\"]*\).*|http://$serv/fileDownLoad\1|p" = | > while read currlink; do > =A0 =A0rev=3D${currlink##*REV=3D} > =A0 =A0prevlink=3D${currlink%%REV=3D*}REV=3D$((rev-1)) > =A0 =A0fetch -qo${prevfile:=3D$(mktemp -t p4diff)} "$prevlink" > =A0 =A0sleep 1 > =A0 =A0fetch -qo${currfile:=3D$(mktemp -t p4diff)} "$currlink" > =A0 =A0read filename > =A0 =A0diff -u $prevfile $currfile | > =A0 =A0sed "s?$prevfile.*?$filename =A0 =A0 =A0 =A0$((ch-1))? > =A0 =A0 =A0 =A0 s?$currfile.*?$filename =A0 =A0 =A0 =A0$ch?" > =A0 =A0rm -f $prevfile $currfile > done > %% > --=20 Olivier Smedts=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=A0 _ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 ASCII ribbon campaign ( ) e-mail: olivier@gid0.org=A0 =A0 =A0 =A0 - against HTML email & vCards=A0 X www: http://www.gid0.org=A0 =A0 - against proprietary attachments / \ =A0 "Il y a seulement 10 sortes de gens dans le monde : =A0 ceux qui comprennent le binaire, =A0 et ceux qui ne le comprennent pas."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTikrCP%2BU07673i=OM-vmdMGiB_Rv73k4U_pLFA%2Bw>