Re: Applying rt-patches

[Henrik Austad <henrik@austad.us>]

[-- Attachment #1: Type: text/plain, Size: 1984 bytes --]

On Thu, Dec 19, 2013 at 09:35:33AM +0100, Ruud Commandeur wrote:
> Hi Everyone,

Hi Ruud,

> I'm using the Linux 3.10.x kernel for a while in an ARM9 embedded
> system. I keep this kernel up-to-date by using incremental patches, with
> 3.10.24 being the last version. I'm thinking of switching to the
> RT-kernel for better real-time behavior, but I have a few questions how
> to do that:
>  
> On a clean 3.10.24 kernel, I assume I should use the
> "patch-3.10.24-rt22.patch" archive (or the "patches-3.10.24-rt22" for a
> collection of single patch files).

Yes, that is correct.

> But what if a 3.10.25 kernel is released? Should I first apply the
> incremental patch for the kernel and then the incremental patch for the
> rt-part? Or should the 3.10.24-rt patch be reverted before applying the
> kernel patch to prevent conflicts?

Hmm, _personally_ I just use git and check out a new stable-branch and then 
apply the corresponding -rtX patch on top of that. Iẗ́'s a pretty big 
hammer, but it removes a lot of potentional snags (me being butterfingered 
an' all :)

If you have a set of local commits you want to carry with you, using the 
broken out rt-patches and 'git quiltimport' lets you quickly get everything 
into a branch.  Then you can cherry-pick the changes you want to add on top 
of that.

At least, this is -my- approach to the matter.

I also know that ro(a)sted keeps a git-repo which he moves forward, so you 
could add your own, local changes to it and just track using 'git pull 
--rebase' or some variant thereof. YMMW and all.
 
> Sorry if the answer to my questions would be somewhere in the Wiki, I
> was not able to find it myself up till now.

I think this is pretty much down to what works best for you, applying the 
incremental patches should probably work too, but I've never tried that 
approach myself. I just use the increments to track changes from one -rtX 
to the next.


-- 
Henrik Austad

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]