Date: Thu, 9 Feb 2012 19:21:41 +0800 From: Meowthink <meowthink@gmail.com> To: Warren Block <wblock@wonkity.com> Cc: freebsd-x11@freebsd.org Subject: Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2) Message-ID: <CABnABoYdUmOTTxe3-4YoUuFyKGOwFAtcmpXKAONg_bZmABo=Cg@mail.gmail.com> In-Reply-To: <alpine.BSF.2.00.1202082325210.28356@wonkity.com> References: <CABnABobGoLGO200z238o=xNRgrOhA4s2xAnJ-mTiQ%2BvsUKDw=A@mail.gmail.com> <alpine.BSF.2.00.1202071413280.88011@wonkity.com> <alpine.BSF.2.00.1202072029110.94134@wonkity.com> <CABnABoYbquaA3OfdNWVqfe3OGh2jBX3rq%2B%2B6L9w33Qi=dJ-NRQ@mail.gmail.com> <alpine.BSF.2.00.1202082325210.28356@wonkity.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Feb 9, 2012 at 2:39 PM, Warren Block <wblock@wonkity.com> wrote:
> On Wed, 8 Feb 2012, Meowthink wrote:
>
>> Hello Warren,
>>
>> It seems that your problem came from command line. Seems I chose a
>> style that not so friendly? Try patch by this way:
>>
>> cd /path/of/src/
>> patch -p3 < /path/to/drm-all.13.1-stable9.1.patch
>
>
> The patch applies (after the sed), but I'm still seeing the duplicated
> files. =A0It's like the patch is doubled, so the kernel build errors out =
on
> finding all the redefinitions.
>
> This is 9stable as of today. =A0It's i386 on a netbook that does not supp=
ort
> amd64.
>
> If there's some step I've missed, please let me know.
Ooops. Seems like patch will simply append the context, when the
target file exists but the diff is made to /dev/null. Though am not
good at dealing with this, I think you can try:
svn revert -R .
svn st | grep '?' | awk {'print $2'} | xargs rm
to gets your local repository fresh/clean. Then do the patchwork all over a=
gain.
Maybe a little off-topic but do worth to discuss. Sorry for
inappropriate if any.
Meowthink
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CABnABoYdUmOTTxe3-4YoUuFyKGOwFAtcmpXKAONg_bZmABo=Cg>