All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
To: Stephan Kappertz <stephan.kappertz@kabelmail.de>
Cc: xenomai@xenomai.org, adam.r.roper@gmail.com
Subject: Re: [Xenomai] Xenomai on Beaglebone
Date: Mon, 17 Sep 2012 20:00:30 +0200	[thread overview]
Message-ID: <5057653E.70600@xenomai.org> (raw)
In-Reply-To: <82C3ADE5-EE56-4579-B5C3-BB5B1D527699@kabelmail.de>

On 09/17/2012 04:43 PM, Stephan Kappertz wrote:

>> On 09/17/2012 02:14 PM, Stephan Kappertz wrote:
>>>> Dear all,
>>>> 
>>>>>> I am interested in getting Xenomai working on the
>>>>>> Beaglebone but I have no previous experience with Xenomai.
>>>>>> I would greatly appreciate it if you would be willing to
>>>>>> share your source code.
>>>> 
>>>> I would be very interested in it too as I am in the exactly
>>>> same case here. I am also new to xenomai and I would want to
>>>> test it in a beaglebone.
>>>> 
>>>>> On 13 September 2012 15:44, Gilles Chanteperdrix wrote: We
>>>>> could distribute this work with Xenomai sources,
>>>> 
>>>> That would be awesome.
>>>> 
>>>>> On 09/13/2012 03:31 PM, Stephan Kappertz wrote: I can provide
>>>>> a combined patchfile against the vanilla 3.2.21 kernel
>>>> 
>>>> That would be great too.
>>>> 
>>>>> On 09/13/2012 03:31 PM, Stephan Kappertz wrote: that
>>>>> includes both the AM335x support as provided by Koen Kois git
>>>>> On 07/12/2012 09:54 PM, Stephan Kappertz wrote: I am using
>>>>> the slightly patched kernel from linux-omap
>>>> 
>>>> In the meanwhile, could you tell us what seems to be the best 
>>>> kernel tree to get xenomai working in the beaglebone? I can't
>>>> find the git repo you talk about.
>>>> 
>>>> Thanks,
>>>> 
>>>> Gdalbeniz
>>> 
>>> The problem with an post patch is that it needs to be updated
>>> for every updated ipipe patch…
>> 
>> The point is that most of the time, you do not need to update it.
>> If you integrate the I-pipe patch in your patch, then it is sure,
>> you need to re-release the patch after every release of the I-pipe
>> patch.
>> 
>>> 
>>> What I could do now is creating a post-patch to the the kernel
>>> after applying the original ipipe-core-3.2.21-arm.patch to the
>>> vanilla kernel. I did not update to ipipe-core-3.2.21-arm-1.patch
>>> though. Gilles, do you have an incremental patch available that I
>>> can apply after the original patch? Making that patch apply
>>> correctly would possibly be less effort than starting with the
>>> full patch again.
>> 
>> I do not understand what you mean. I was talking about a pre and
>> post patch, not of a post patch only.
>> 
>> 
>> -- Gilles.
>> 
> 
> Ok. How would I create such a pre-patch? Basically I would have to
> patch the Koen Koi sources so that the ipipe patch applies
> successfully. Which means that I have to make them "look like" the
> vanilla kernel. Sounds like a huge effort given that I had to change
> the ipipe patch at around 50 places to get it apply successfully. Or
> am I missing something?


The way I do it:

keep the branch which works preciously, it should not be changed.

Checkout a temporary branch from the vendor branch (that would be what
you call the "Koen Koi sources").
Try and apply the I-pipe patch, see all files conflicting. The
pre-patch is the reverse diff between the files in the vanilla kernel,
and the files conflicting in the vendor branch.
Generate the pre-patch.
git reset --hard
git clean -df (beware this erases all files non commited in git, so do
not do that if you keep precious files not under git control)
Apply the pre-patch.
Apply the I-pipe patch.

The post-patch is the difference between the current contents of your
working directory and the contents of the precious branch that works.
You may want to add all files and commit in the temporary branch to be
able to generate the post patch with "git diff".

-- 
                                                                Gilles.



  reply	other threads:[~2012-09-17 18:00 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <f4e484caea0dc89aaa132406e82ac5ae@theropers.us>
2012-09-13 13:31 ` [Xenomai] Xenomai on Beaglebone Stephan Kappertz
2012-09-13 13:44   ` Gilles Chanteperdrix
     [not found]     ` <CAMpYrwA+-Rhr=MvA2sLXFgHp0o7fseukeaoFDhO6Xej-VUjF_A@mail.gmail.com>
2012-09-17 11:21       ` Oier G. de Albeniz
2012-09-17 12:14       ` Stephan Kappertz
2012-09-17 12:23         ` Gilles Chanteperdrix
2012-09-17 14:43           ` Stephan Kappertz
2012-09-17 18:00             ` Gilles Chanteperdrix [this message]
2013-01-16 17:59   ` Yogi
2013-01-16 18:34     ` John Morris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5057653E.70600@xenomai.org \
    --to=gilles.chanteperdrix@xenomai.org \
    --cc=adam.r.roper@gmail.com \
    --cc=stephan.kappertz@kabelmail.de \
    --cc=xenomai@xenomai.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.