On 2015-07-30 15:15, Glen Barber wrote: > On Thu, Jul 30, 2015 at 08:13:51PM +0000, Glen Barber wrote: >> On Thu, Jul 30, 2015 at 03:09:30PM -0500, Larry Rosenman wrote: >> > $ sudo -s >> > Password: >> > # cd /usr/src >> > # patch -p0 < ~ler/pmspcv.diff >> > Hmm... Looks like a unified diff to me... >> > The text leading up to this was: >> > -------------------------- >> > |Index: sys/dev/pms/freebsd/driver/common/lxutil.c >> > |=================================================================== >> > |--- sys/dev/pms/freebsd/driver/common/lxutil.c (revision 286083) >> > |+++ sys/dev/pms/freebsd/driver/common/lxutil.c (working copy) >> > -------------------------- >> > Patching file sys/dev/pms/freebsd/driver/common/lxutil.c using Plan A... >> > Hunk #1 failed at 758. >> > Hunk #2 failed at 767. >> > 2 out of 2 hunks failed--saving rejects to >> > sys/dev/pms/freebsd/driver/common/lxutil.c.rej >> > done >> > # vi sys/dev/pms/freebsd/driver/common/lxutil.c.rej >> > _at__at_ -758,6 +758,7 _at__at_ >> > int idx;^M >> > static U32 cardMap[4] = { 0, 0, 0, 0 };^M >> >> Hmm. Somehow you ended up with MS DOS EOL... >> >> I'm able to apply the patch without issues. Try this: >> >> vi pmspcv.diff >> :%s:[ctrl-m]::g >> >> It should apply afterward. >> > > Or, fetch the patch from here: > > https://people.freebsd.org/~gjb/pmspcv.diff.txt > > Glen Kernel compiling -- give mr a bit and I'll boot it and make sure it comes up. -- Larry Rosenman http://www.lerctr.org/~ler Phone: +1 214-642-9640 E-Mail: ler_at_lerctr.org US Mail: 7011 W Parmer Ln, Apt 1115, Austin, TX 78729-6961Received on Thu Jul 30 2015 - 18:20:47 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:40:58 UTC