Re: [leaf-devel] wpasupplicant
Hi Erich; Am Mittwoch, 28. Oktober 2015, 14:40:50 schrieb Erich Titl: > Hi KP > > You lifted wpasupplicant to 2.5 now it does not appear to compile. > > Could you tell me the rationale for > > .source: > - zcat $(SOURCE_TARBALL) | tar -xvf - > + $(BT_SETUP_BUILDDIR) -v $(SOURCE_TARBALL) > touch .source Standardization. > This does not work in my environment s Ok, if it doesn't work for wpasupplicnat, I'll revert this change. sorry kp -- ___ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
Re: [leaf-devel] wpasupplicant
Le 8 janv. 2015 à 11:53, Erich Titl erich.t...@think.ch a écrit : Am 08.01.2015 um 10:57 schrieb Yves Blusseau: Le 8 janv. 2015 à 09:53, Erich Titl erich.t...@think.ch a écrit : Salut Yves Am 08.01.2015 um 08:46 schrieb Yves Blusseau: One more thing, was is the branch ‘config’ for ? If it’s a feature branch it need to be more descriptive. If it’s a branch that is own by someone else it’s better to name it name-branch. I don't like the fact that leaf has only this old fashoned way of being configured. I created the config branch to to adress a few things not everybody saw necessary to be tackled. Like for any project some small profit always emerges as a side effect. Renaming config IMHO is about as meaningful as renaming master or maint, both these names are as arbitrary as any other, but again, opinions may differ. If there is a way to give config a meaningful name without too much trouble I could not care less. Ok erich, no problem about the name of the ‘config’ branch. So now what is your problem with git ? Not really a problem, we are looking for the easiest way to port two changes to maint, namely commit 3ab39e8b8c7fc5635563010f29dd7b9e9ef9cbde Author: Erich Titl erich.t...@think.ch Date: Tue Dec 9 12:24:44 2014 +0100 added libnl3 to wpasuppicant dependencies commit f65c46f40394e23fc00c8d36d6cb37831706efc0 Author: Erich Titl erich.t...@think.ch Date: Mon Dec 8 20:59:28 2014 +0100 Added NL80211 driver to wpasupplicant I don't know how to move these from the commit branch to maint branch without messing it up. I could, of course, just redo them in maint. The best is to create another (temporary) branch that is a copy of the ‘config’ branch: git checkout -b tmp config Then do a rebase and trash all the commits that you doesn’t want to merge: git rebase -i maint Then merge the commit into ‘maint’: git checkout maint git pull —rebase git merge tmp You can then trash the tmp branch: git branch -d tmp You can then rebase the ‘config’ branch from maint so the commits that has been merge into maint will be automatically remove: git checkout config git rebase maint BTW. what is the best practice to keep a branch in sync, rebase locally first, then push? Yes, for a topic branch a rebase is often better. So a git pull —rebase is often the right command. Regards, Yves -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
Re: [leaf-devel] wpasupplicant
Salut Yves Am 08.01.2015 um 08:46 schrieb Yves Blusseau: One more thing, was is the branch ‘config’ for ? If it’s a feature branch it need to be more descriptive. If it’s a branch that is own by someone else it’s better to name it name-branch. I don't like the fact that leaf has only this old fashoned way of being configured. I created the config branch to to adress a few things not everybody saw necessary to be tackled. Like for any project some small profit always emerges as a side effect. Renaming config IMHO is about as meaningful as renaming master or maint, both these names are as arbitrary as any other, but again, opinions may differ. If there is a way to give config a meaningful name without too much trouble I could not care less. cheers Erich smime.p7s Description: S/MIME Cryptographic Signature -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
Re: [leaf-devel] wpasupplicant
Hello all, and happy new year. Cherry picking is not a good solution. If you want to commit only some changes from one branch to another you can use git add -p for example to select the portion of « code » you want to add. You can alse use rebase -i to create specific commits in a branch and only merges that ones into another branch. If you describe exactly the problem i can think about what can be the « best solution ». Regards, Yves Le 6 janv. 2015 à 18:05, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Am Sonntag, 4. Januar 2015, 00:00:57 schrieb Erich Titl: Hi I made a commit to include the nl80211 in the config branch. I don't really want to merga all that stuff there into maint as it is not yet ready, but having nl80211 instead of wext only in wpasupplicant would be fine. Should I just apply the same to maint or is there a way to include this commit commit f65c46f40394e23fc00c8d36d6cb37831706efc0 Author: Erich Titl erich.t...@think.ch Date: Mon Dec 8 20:59:28 2014 +0100 Added NL80211 driver to wpasupplicant into maint? cheers Erich Hi Erich; I hoped Yves will respond with much more experience about git than I have. Don't know if it breaks git history etc, but IMHO just commit the change to maint. Looking at your git commits in config branch I'm curious if works as expected. AFAIK it's wrong to merge from maint to config and to merge back into maint. So we may see problems when merging config as a whole... kp -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
Re: [leaf-devel] wpasupplicant
One more thing, was is the branch ‘config’ for ? If it’s a feature branch it need to be more descriptive. If it’s a branch that is own by someone else it’s better to name it name-branch. Regards, Yves -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
Re: [leaf-devel] wpasupplicant
Hi Erich; Am Dienstag, 6. Januar 2015, 18:39:28 schrieb Erich Titl: Hi KP Am 06.01.2015 um 18:05 schrieb kp kirchdoerfer: I hoped Yves will respond with much more experience about git than I have. ... Looking at your git commits in config branch I'm curious if works as expected. AFAIK it's wrong to merge from maint to config and to merge back into maint. So we may see problems when merging config as a whole... I am surprised, I never even tried to merge maint into config, just (tried to) rebase config as maint moved on and apparently my local repository somehow got out of sync with origin. It should be no major problem if maint moves on - merging your commits to config into maint would have been easy without rebasing. I've done that a few times as adviced here: http://bering-uclibc.zetam.org/wiki/Bering-uClibc_5.x_-_Developer_Guide_-_Appendices_-_Git_Workflows esp.: http://bering-uclibc.zetam.org/wiki/Developer_Guide_-_Git_Workflows#Topic_branches Hopefully there will be no problems, else as Andrew remarked, cherrypicking might be the right way, but it appears to be tedious. I have yet to see a comprehensive tool to compare and merge two branches. Hopefully Yves will help if that causes issues :) Anyway, since you've asked for single commit for next release, I'd say just commit this one and we'll see how we can solve other possible issues later. kp -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
Re: [leaf-devel] wpasupplicant
Hi KP Am 06.01.2015 um 18:05 schrieb kp kirchdoerfer: I hoped Yves will respond with much more experience about git than I have. ... Looking at your git commits in config branch I'm curious if works as expected. AFAIK it's wrong to merge from maint to config and to merge back into maint. So we may see problems when merging config as a whole... I am surprised, I never even tried to merge maint into config, just (tried to) rebase config as maint moved on and apparently my local repository somehow got out of sync with origin. Hopefully there will be no problems, else as Andrew remarked, cherrypicking might be the right way, but it appears to be tedious. I have yet to see a comprehensive tool to compare and merge two branches. cheers Erich smime.p7s Description: S/MIME Cryptographic Signature -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
Re: [leaf-devel] wpasupplicant
Am Sonntag, 4. Januar 2015, 00:00:57 schrieb Erich Titl: Hi I made a commit to include the nl80211 in the config branch. I don't really want to merga all that stuff there into maint as it is not yet ready, but having nl80211 instead of wext only in wpasupplicant would be fine. Should I just apply the same to maint or is there a way to include this commit commit f65c46f40394e23fc00c8d36d6cb37831706efc0 Author: Erich Titl erich.t...@think.ch Date: Mon Dec 8 20:59:28 2014 +0100 Added NL80211 driver to wpasupplicant into maint? cheers Erich Hi Erich; I hoped Yves will respond with much more experience about git than I have. Don't know if it breaks git history etc, but IMHO just commit the change to maint. Looking at your git commits in config branch I'm curious if works as expected. AFAIK it's wrong to merge from maint to config and to merge back into maint. So we may see problems when merging config as a whole... kp -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
Re: [leaf-devel] wpasupplicant
There's a 'git cherrypick' tool to copy commit to another branch. But I don't know how good is this solution. 06.01.2015 19:05, kp kirchdoerfer пишет: Am Sonntag, 4. Januar 2015, 00:00:57 schrieb Erich Titl: Hi I made a commit to include the nl80211 in the config branch. I don't really want to merga all that stuff there into maint as it is not yet ready, but having nl80211 instead of wext only in wpasupplicant would be fine. Should I just apply the same to maint or is there a way to include this commit commit f65c46f40394e23fc00c8d36d6cb37831706efc0 Author: Erich Titl erich.t...@think.ch Date: Mon Dec 8 20:59:28 2014 +0100 Added NL80211 driver to wpasupplicant into maint? cheers Erich Hi Erich; I hoped Yves will respond with much more experience about git than I have. Don't know if it breaks git history etc, but IMHO just commit the change to maint. Looking at your git commits in config branch I'm curious if works as expected. AFAIK it's wrong to merge from maint to config and to merge back into maint. So we may see problems when merging config as a whole... kp -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
Re: [leaf-devel] wpasupplicant with nl80211
Am Montag, 8. Dezember 2014, 17:33:14 schrieb Erich Titl: Hi Folks I would like to add the nl80211 driver to wpasupplicant but apparently libnl is missing. I faintly recall there used to be a problem with -lnl in the past ans was wonderin what solution was taken. Here is the error showing in the log CC ../src/drivers/driver_nl80211.c /home/mega/leaf/devel/bering-uclibc/toolchain/i486-unknown-linux-uclibc/lib/ gcc/i486- unknown-linux-uclibc/4.8.3/../../../../i486-unknown-linux-uclibc/bin/ld: cannot find -lnl So libnl is missing in the buildtool environment. I found libnl-3 which might do the job. Can anyone confirm this? libnl-3 is the successor to libnl and all our packages now use libnl-3 instead libnl. You'll to massage wpa-supplicant to use libnl-3. It wasn't easy for the packages we moved in the past and we've various ways. Grep for libnl3 in conf/sources.d and look for packages using libnl-3 to see what we've done so far. hth kp -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151iu=/4140/ostg.clktrk ___ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
Re: [leaf-devel] wpasupplicant with nl80211
Hi KP Am 08.12.2014 um 18:07 schrieb kp kirchdoerfer: .. libnl-3 is the successor to libnl and all our packages now use libnl-3 instead libnl. You'll to massage wpa-supplicant to use libnl-3. It wasn't easy for the packages we moved in the past and we've various ways. Grep for libnl3 in conf/sources.d and look for packages using libnl-3 to see what we've done so far. Great, that was easy cheers Erich smime.p7s Description: S/MIME Cryptographic Signature -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151iu=/4140/ostg.clktrk ___ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
