From owner-freebsd-emulation@FreeBSD.ORG Tue Jun 6 15:35:47 2006 Return-Path: X-Original-To: freebsd-emulation@FreeBSD.org Delivered-To: freebsd-emulation@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0657116C631 for ; Tue, 6 Jun 2006 15:31:16 +0000 (UTC) (envelope-from bsam@ns.kfs.ru) Received: from ns.kfs.ru (kfs.kfs.ru [62.183.117.194]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7567943D45 for ; Tue, 6 Jun 2006 15:31:15 +0000 (GMT) (envelope-from bsam@ns.kfs.ru) Received: from bsam by ns.kfs.ru with local (Exim 4.54 (FreeBSD)) id 1FndWT-000ESe-Hm; Tue, 06 Jun 2006 19:31:13 +0400 To: Divacky Roman References: <20060605122603.GA25775@stud.fit.vutbr.cz> From: Boris Samorodov Date: Tue, 06 Jun 2006 19:31:13 +0400 In-Reply-To: <20060605122603.GA25775@stud.fit.vutbr.cz> (Divacky Roman's message of "Mon, 5 Jun 2006 14:26:03 +0200") Message-ID: <17387310@serv3.int.kfs.ru> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: "Boris B. Samorodov" Cc: freebsd-emulation@FreeBSD.org Subject: Re: amd64 module of linuxolator X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jun 2006 15:35:59 -0000 Hi Roman, glad to see you enhancing FreeBSD linuxolator. On Mon, 5 Jun 2006 14:26:03 +0200 Divacky Roman wrote: > I made a patch which enables module build of linuxolator. you can get it at: > www.stud.fit.vutbr.cz/~xdivac02/l64.patch, pls test it. > I am especially interested in loading the module with/without COMPAT_*32 > various options Here what I have: ===== # uname -srm FreeBSD 6.1-RELEASE amd64 # cd /usr/src/sys # patch -C -p4 < l64.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#1 - /root/projects/soc2006/amd64/linux32/syscalls.master ==== |--- /tmp/tmp.59671.0 Mon Jun 5 20:23:57 2006 |+++ /root/projects/soc2006/amd64/linux32/syscalls.master Mon Jun 5 20:20:35 2006 -------------------------- Patching file amd64/linux32/syscalls.master using Plan A... Hunk #1 succeeded at 4. Hunk #2 failed at 14. Hunk #3 failed at 43. Hunk #4 succeeded at 318 (offset 1 line). Hunk #5 succeeded at 403 (offset 1 line). Hunk #6 succeeded at 416 (offset 1 line). Hunk #7 succeeded at 429 (offset 1 line). 2 out of 7 hunks failed--saving rejects to amd64/linux32/syscalls.master.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#1 - /root/projects/soc2006/i386/linux/syscalls.master ==== |--- /tmp/tmp.59671.1 Mon Jun 5 20:23:57 2006 |+++ /root/projects/soc2006/i386/linux/syscalls.master Mon Jun 5 19:44:32 2006 -------------------------- Patching file i386/linux/syscalls.master using Plan A... Hunk #1 succeeded at 429 (offset -5 lines). done ===== Should the patch be applied to -current? WBR -- Boris B. Samorodov, Research Engineer InPharmTech Co, http://www.ipt.ru Telephone & Internet Service Provider