Date: Thu, 12 Mar 2009 09:14:56 +0300 From: Boris Samorodov <bsam@ipt.ru> To: Novembre <novembre@gmail.com> Cc: Alexander Leidinger <Alexander@leidinger.net>, freebsd-emulation@freebsd.org Subject: Re: Flash 9 crash problems Message-ID: <02319391@bb.ipt.ru> In-Reply-To: <3b47caa90903111714p4b82f672t6597b4fa84cc2ba6@mail.gmail.com> (novembre@gmail.com's message of "Wed\, 11 Mar 2009 19\:14\:11 -0500") References: <3b47caa90903021351g4ceb832ap866cccd940cfb68b@mail.gmail.com> <20090303083430.64927hdcfxdcmjok@webmail.leidinger.net> <3b47caa90903031841m75eb3553jdd38cc47972990cc@mail.gmail.com> <20090304084315.587314cev8vm3f34@webmail.leidinger.net> <3b47caa90903111714p4b82f672t6597b4fa84cc2ba6@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 11 Mar 2009 19:14:11 -0500 Novembre wrote: > On Wed, Mar 4, 2009 at 2:43 AM, Alexander Leidinger <Alexander@leidinger.net > > wrote: > > Quoting Novembre <novembre@gmail.com> (from Tue, 3 Mar 2009 20:41:03 > > -0600): > > > > I found two posts containing patches regarding this issue: > >> 1) > >> > >> http://docs.freebsd.org/cgi/getmsg.cgi?fetch=0+0+archive/2008/freebsd-emulation/20081228.freebsd-emulation > >> 2) > >> > >> http://docs.freebsd.org/cgi/getmsg.cgi?fetch=0+0+archive/2009/freebsd-emulation/20090215.freebsd-emulation > >> > >> The first post contains two patches, of which one is marked specifically > >> for > >> 7-STABLE (as of Dec 21, 2008 when the patches were made available). The > >> second post also has a patch, but I don't know whether it is for 8-CURRENT > >> or 7-STABLE. Which one should I apply? > >> > > > > If you do not want to wait: the patch utility has the option "-C" which > > just tries to apply the patch but does not really apply it. This way you can > > see if a patch is applicable to what you have or not. This way you can test > > if one of all those patches applies at all to what you have. In the worst > > case it applies, but you get a kernel panic upon use of some linux stuff > > (you may lose data because of this). In the best case at least one applies > > and it works perfectly. > > > I copied both files to /usr/src/sys/ and tried patching with -C option. It > asks me a question about > which file to patch! Here's the result: > #pwd > /usr/src/sys > #patch -C < futexes_partial_II.patch # patch -Cp2 ... > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c > |index 4f6d178..0aea61d 100644 > |--- a/sys/amd64/amd64/elf_machdep.c > |+++ b/sys/amd64/amd64/elf_machdep.c > -------------------------- > File to patch: > # patch -C < mega-st7.linux.patch The same here. > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff --git a/sys/amd64/include/elf.h b/sys/amd64/include/elf.h > |index 0a386be..3c2cd20 100644 > |--- a/sys/amd64/include/elf.h > |+++ b/sys/amd64/include/elf.h > -------------------------- > File to patch: > I have no idea what to tell it, so I just press Ctrl-C to cancel the > command. Any ideas? man patch, please WBR -- Boris Samorodov (bsam) Research Engineer, http://www.ipt.ru Telephone & Internet SP FreeBSD Committer, http://www.FreeBSD.org The Power To Serve
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?02319391>