Date: Wed, 8 Feb 2012 21:37:37 +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: <CABnABoYbquaA3OfdNWVqfe3OGh2jBX3rq%2B%2B6L9w33Qi=dJ-NRQ@mail.gmail.com> In-Reply-To: <alpine.BSF.2.00.1202072029110.94134@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>
next in thread | previous in thread | raw e-mail | index | archive | help
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 Or, my preferred way: cd /path/of/src/ svn patch --strip 2 /path/to/drm-all.13.1-stable9.1.patch The reason is that the working directory of my patch is set to svn base, but typically we checkout svn /stable/9/ to /usr/src/, so there's 2 levels of path to be stripped out. Unfortunately, this style also differs from kib's. I'll try to match his next time. Cheers, Meowthink On Wed, Feb 8, 2012 at 11:32 AM, Warren Block <wblock@wonkity.com> wrote: > On Tue, 7 Feb 2012, Warren Block wrote: > >> On Tue, 7 Feb 2012, Meowthink wrote: >> >>> to Warren, >>> Yes, $FreeBSD$ id in i915_suspend.c should be manually edited BEFORE >>> patch(or try to deal with svn:keywords). >>> And ... I don't know why you got those Makefiles rejected, as they >>> were there, not modified in the official repository, for quite a long >>> time. Any detail? >> >> >> But this works: >> > > Erred pasting that: > > > # sed -i -e 's/FreeBSD: src.*Exp /FreeBSD/' > /usr/src/sys/dev/drm/i915_suspend.c > >> =A0# cd /usr/src/sys >> =A0# patch -p1 < drm-all.13.1-stable9.1.patch
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CABnABoYbquaA3OfdNWVqfe3OGh2jBX3rq%2B%2B6L9w33Qi=dJ-NRQ>