From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by nuthatch.gentoo.org with esmtp (Exim 4.43) id 1Dqcmf-0003n4-JD for garchives@archives.gentoo.org; Thu, 07 Jul 2005 20:15:46 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.13.4/8.13.4) with SMTP id j67KEF2B030027; Thu, 7 Jul 2005 20:14:15 GMT Received: from zproxy.gmail.com (zproxy.gmail.com [64.233.162.205]) by robin.gentoo.org (8.13.4/8.13.4) with ESMTP id j67K94Eb017694 for ; Thu, 7 Jul 2005 20:09:05 GMT Received: by zproxy.gmail.com with SMTP id p8so128220nzb for ; Thu, 07 Jul 2005 13:09:05 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=COXitbaElwha3s5uwtc9QnzcWrVubhFmLObaNyaFNy8Wrgck7cLgO5YYZhRElx0tDH3jdVseo7DlPHgOGTqwUuHC8dtp0D1CwbkPiLrgs4UgpXHnpKTb3fboCD+zZRuovNyRbCdcNk/e5tWuKRhktm6rO0uuaVkjojSnXqmJOyc= Received: by 10.36.4.14 with SMTP id 14mr506031nzd; Thu, 07 Jul 2005 13:09:05 -0700 (PDT) Received: by 10.36.57.9 with HTTP; Thu, 7 Jul 2005 13:09:05 -0700 (PDT) Message-ID: <5bdc1c8b05070713097ebe8d08@mail.gmail.com> Date: Thu, 7 Jul 2005 13:09:05 -0700 From: Mark Knecht To: gentoo-user@lists.gentoo.org Subject: Re: [gentoo-user] Adding realtime-prempt kernel patches to gentoo-sources In-Reply-To: <42CD6F77.5030403@gmx.de> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-user@gentoo.org Reply-to: gentoo-user@lists.gentoo.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Disposition: inline References: <5bdc1c8b05070710451075bdd5@mail.gmail.com> <42CD6F77.5030403@gmx.de> Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by robin.gentoo.org id j67K94Eb017694 X-Archives-Salt: d58e4b42-50d0-4781-8eda-8ddc65e403da X-Archives-Hash: 469559b6e8770809c4690cb37ca00c71 On 7/7/05, Christian Heim wrote: > Mark Knecht wrote: > > QUESTIONS: > > > > 1) Can I assume that whatever happened with the "Hunk #x succeeded" > > that everything is OK? Maybe this was just a line number issue? > Yeah .. or and indent change or something similar. > > > > > 2) What can I do about the "Hunk #x FAILED" messages? > Well to get that patch working, you *need* to take a look at the *.rej > files > which are created by patch -p1 < realtime-prempt.patch. > > Most times this is only due to missing context. That means the line just > before > the one which should be added, is not there or another one is just in > the way. > So `patch` is unable to find the matching context. > > > > No output files were created since it was only a dry run. I can run > > again, get output files, and then look into it but I thought I'd ask > > how folks go about this sort of thing before I pulled the trigger. > > Regards Christian > Hi Christian, Thanks for the response. There were just two problems, as best I can tell. One was in the upper level makefile which the second was in a more tecnical piece of code. I'm providing the output here more for conversation and not really asking for technical help on changing code. This is just for my learning. In the first one it appears that Gentoo does an extra version so I can probably fake my way around this but changing the patch file itself to expect the Gentoo kernel I want to patch. Is that a reasonable strategy? In the second, since it's apparently just a difference in brakets I'm more curious about why gentoo-sources would differ from what Ingo was apparently expectinb in the kernel config file, but again it seems pretty minor. Would you agree? Thanks, Mark Makefile.rej: *************** *** 1,7 **** VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 12 - EXTRAVERSION = NAME=Woozy Numbat # *DOCUMENTATION* --- 1,7 ---- VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 12 + EXTRAVERSION = -RT-V0.7.51-11 NAME=Woozy Numbat # *DOCUMENTATION* drivers/video/console/fbcon.c.rej: *************** *** 1092,1101 **** struct display *p = &fb_display[vc->vc_num]; struct fbcon_ops *ops = info->fbcon_par; - if (!fbcon_is_inactive(vc, info)) ops->putcs(vc, info, s, count, real_y(p, ypos), xpos, get_color(vc, info, scr_readw(s), 1), get_color(vc, info, scr_readw(s), 0)); } static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos) --- 1091,1101 ---- struct display *p = &fb_display[vc->vc_num]; struct fbcon_ops *ops = info->fbcon_par; + if (!fbcon_is_inactive(vc, info)) { ops->putcs(vc, info, s, count, real_y(p, ypos), xpos, get_color(vc, info, scr_readw(s), 1), get_color(vc, info, scr_readw(s), 0)); + } } static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos) -- gentoo-user@gentoo.org mailing list