On 10/06/2014 07:17 PM, Alexey Shaposhnikov wrote: > ./scripts/ipipe/genpatches.sh v3.4.103 > reference: v3.4.103, kernel version: 3.4.6
You are generating I-pipe patches for the diff between v3.4.103 and v3.4.6. This is probably not what you want to do. If you want to generate I-pipe patch for 3.4.6 branch, then simply run genpatches.sh v3.4.6 or genpatches.sh with no argument. But these patches are available here: http://download.gna.org/adeos/patches/v3.x/arm/older/ What I would do if I were you is: git checkout -b my-3.4 legacy/core-3.4 git merge v3.4.103 Fix the conflicts. genpatches.sh v3.4.103, in order to generate patches for the 3.4.103 branch. Then git merge sun-xi Fix the conflicts and get the port running Then follow: http://xenomai.org/2014/09/porting-xenomai-dual-kernel-to-a-new-arm-soc/#Working_with_vendor_forks To generate pre- and post- patches for the patches for 3.4.103 generated above. Alternatively, run genpatches.sh sun-xi in order to generate an all-in-one adeos patch for the sun-xi kernel. It may also make sense since the kernel 3.4 is a bit old now (more than 2 years), so we are not going to include a new version of it in a next release of xenomai. -- Gilles. _______________________________________________ Xenomai mailing list [email protected] http://www.xenomai.org/mailman/listinfo/xenomai
