Tim Sander wrote: > Thanks for your quick(!) hints for git. For testing i just copied > platforms/kernel.in > and rules/kernel.make to the 2010-03-0 release and tested there > since this is the version i was using for my project...
In the git world, don't copy files, you can cherry-pick patches: it works this way: First create a branch ptxdist-2010.03.0-simpleimage which will be based on ptxdist-2010.03.0: $ git checkout -b ptxdist-2010.03.0-simpleimage ptxdist-2010.03.0 I've uploaded the updated version of next/simpleimage to my repository. Please update: $ git fetch mkl Open my branch in gitk: $ gitk mkl/next/simpleimage You're interested in the two topmost patches: They commit ids are: 00e8c1233a3e25de74001cb73e397f27b63f9059 6d5f138ca95b0ee76297bd2c511e76c2e65cacf4 Then tell git to apply this patch on your current tree (which is the 2010.03.0 release): $ git cherry-pick 00e8c1233a3e25de74001cb73e397f27b63f9059 -s -x (-s adds your Signed-off-by, the -x adds a message that this sommit is cherry picked) Git will apply this patch, but it doesn't apply anymore. Git will produce a file with conflicts that you have to resolve. But this is pretty easy in this case: Open platforms/kernel.in in an editor, look at the original patch in gitk. Look for the conflict marks (<<<, >>>). Then you'll see that the "support the different kernel image formats" block should be removed. Remove it, save the file. Tell git that you have resolved the conflict: $ git add rules/kernel.make See if the patchs looks good: $ git diff --cached Commit the changes: $ git commit -s Then cherry-pick the 2nd patch: $ git cherry-pick 7160cd62bb27526ed555d7148f6c676c763fa5c3 -s -x Here it works without problems. I have pushed my result to my repo in the "for-tim/ptxdist-2010.030-simpleimage" branch. Now you make a diff of your cherry-pick against mine: $ git diff mkl/for-tim/ptxdist-2010.030-simpleimage > It works, the only thing i found out the hard way. The name of the simple > image > does corespond to some bootup fixes. So the example name is a bad pick... > The patch below fixes that. Okay, I'll integrate the better default name fixes. I've pushed an updated patch to next/simpleimage, merged it and pushed into mailine. > Further i had a warning: > platforms/kernel.in:4:warning: 'select' used by config symbol 'KERNEL' refers > to undefined symbol 'IMAGE_KERNEL' > but i guess thats due to my "quick test procedure"? There is some version > information > missing in the git tree. Since i didn't knew what version information to put > in at which > place i bailed out at this point... should be solved with the above cherry pick. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
-- ptxdist mailing list [email protected]
