marc doz wrote:
> Hi,
> I don't know where do you from my vendor kernel but it seems that it
> is a 2.6.32 kernel.
I have no doubt that it is a 2.6.32 kernel. The question is to know
whether it is a vanilla kernel, i.e. coming from kernel.org. Since in
your first post the kernel directory was named linux_0030 or something
like that, I assumed it was not. But in any case it does not change
anything since the I-pipe patch for arm does not exist for linux-2.6.32
either.
> This is my first time with git ! so I will need that you valid my
> method, please.
>
> I test with these commands :
>
> #git clone git://git.denx.de/ipipe-2.6.git
> #git checkout -branch -b ipipe-2.6.32-noarch origin/ipipe-2.6.32-noarch
> #git checkout -b vendor
> #cp -vR ../TI_linux/* ./
It will work better if the branch "vendor" comes from the vendor git.
> #git add *
> #git commit
> #git checkout ipipe-2.6.32-noarch
> #git merge vendor
Ill-chosen name. Since this is the branch where you will make the merge,
you should call it, say, vendor+ipipe-2.6.32-arm. Having a branch called
ipipe-2.6.32-noarch which in fact contains the vendor kernel patches with
> --> no error, no warning
That was expected.
> #git checkout -branch -b ipipe-2.6.31-noarch origin/ipipe-2.6.31-noarch
> #git checkout -branch -b ipipe-2.6.31-arm origin/ipipe-2.6.31-arm
You do not really need to checkout this branches. All you need is to
generate the patch with:
git diff origin/ipipe-2.6.31-noarch origin/ipipe-2.6.31-arm
> #git checkout ipipe-2.6.32-noarch
> #cat ../result.patch | patch -p1
> #find . -name '*.reji'
The rejects are expected, you are applying changes for a 2.6.31 kernel
to a 2.6.32 kernel, vendor-specific or not, this makes rejects. Anyway,
maybe you will get less rejects if you use 2.6.33 instead of 2.6.31.
Rejects in entry-*.S are no good sign, and will be hard to fix (without
more knowledge of the Adeos patch). Please try 2.6.33.
--
Gilles.
_______________________________________________
Xenomai-help mailing list
[email protected]
https://mail.gna.org/listinfo/xenomai-help
