on 17.10.2012 19:51, Yves Blusseau wrote: > .... > about how to format the commit message. > > Like KP said if you are unsure push to a remote branch : > erich-openswan-update with > git push origin HEAD:erich-openswan-update
Jeeeeez, it's a no brainer. Much too complicated. Somehow I don't like the idea of remoe branches, clutters up the site like hell. I will rebase my workspace to see how it looks, if you like it I can push, if not, what the heck, I can always keep my local branch. commit 1b79f2267155238e19a537becb342861d4b54f35 Author: mega <erich.t...@think.ch> Date: Wed Oct 17 23:54:20 2012 +0200 This is a bug/feature change for OpenSwan on BuC 4.x 1) it introduces openswan-2.6.38-android-ics-natoa.patch which is necessary to allow android 4.x devices to connect using the on board ipsec/l2tp implementation to interact with OpenSwan 2) it implements the above with the standard leaf 4.x build environment by * introducing a dependency between kmodules and openswan * adding code in the makefile * adding the patch to the buildenv config 3) it fixes a bug in the makefile depending on parameters in the environment which are not passed in the srcclean implementation mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git checkout maint Switched to branch 'maint' Your branch is behind 'origin/maint' by 1 commit, and can be fast-forwarded. mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git rebase openswan First, rewinding head to replay your work on top of it... Fast-forwarded maint to openswan. mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git status # On branch maint # Your branch and 'origin/maint' have diverged, # and have 1 and 1 different commit(s) each, respectively. # nothing to commit (working directory clean) Now what is missing may be a change to kmodules to add ipsec.ko to the list of modules to be included in moddb, else this can be left out in the modules tarball. cheers Erich
smime.p7s
Description: S/MIME Kryptografische Unterschrift
------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel