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 1Dqd5b-0001q1-Sm for garchives@archives.gentoo.org; Thu, 07 Jul 2005 20:35:20 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.13.4/8.13.4) with SMTP id j67KXq88025475; Thu, 7 Jul 2005 20:33:53 GMT Received: from mail.gmx.net (pop.gmx.net [213.165.64.20]) by robin.gentoo.org (8.13.4/8.13.4) with SMTP id j67KSoGW009962 for ; Thu, 7 Jul 2005 20:28:50 GMT Received: (qmail invoked by alias); 07 Jul 2005 20:28:51 -0000 Received: from p548BD83C.dip.t-dialin.net (EHLO [192.168.17.240]) [84.139.216.60] by mail.gmx.net (mp033) with SMTP; 07 Jul 2005 22:28:51 +0200 X-Authenticated: #26099252 Message-ID: <42CD911D.4040401@gmx.de> Date: Thu, 07 Jul 2005 22:31:25 +0200 From: Christian Heim User-Agent: Mozilla Thunderbird 1.0.2 (X11/20050629) X-Accept-Language: en-us, en 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 To: gentoo-user@lists.gentoo.org Subject: Re: [gentoo-user] Adding realtime-prempt kernel patches to gentoo-sources References: <5bdc1c8b05070710451075bdd5@mail.gmail.com> <42CD6F77.5030403@gmx.de> <5bdc1c8b05070713097ebe8d08@mail.gmail.com> In-Reply-To: <5bdc1c8b05070713097ebe8d08@mail.gmail.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 X-Archives-Salt: 10226319-661f-4fb6-b8b5-c6ba4ce75845 X-Archives-Hash: ffec53d6fcc236939f14a278ba6274e4 Mark Knecht wrote: > On 7/7/05, Christian Heim wrote: > > 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? Make, if I understood you right, you would like to do the prempt stuff ontop of gentoo-sources, right ? Well then simply do the following: # emerge a fresh copy of gentoo-sources $ emerge gentoo-sources # create a copy (or call it a fork ;)) of this kernel-directory $ cd /usr/src $ rsync -rt --progress linux-2.6.12-gentoo-r4/* linux-2.6.12-gentoo-r4.orig # now go on and apply your patch to the linux-2.6.12-gentoo-r4-directory. Once you are done, just go back to /usr/src and create a diff between plain gentoo-sources and your prempt-patched gentoo-sources. $ cd /usr/src $ diff -Nrup linux-2.6.12-gentoo-r4.orig linux-2.6.12-gentoo-r4 > gentoo-sources-2.6.12-r4-prempt.patch > 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? See above ;) > 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? Yeah, those rejects are really pretty minor. I guess these brakets differences result from vesafb. But that's only a guess. > 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) > Regards Christian -- gentoo-user@gentoo.org mailing list