Re: [leaf-devel] BuC 4.3 interface naming

2012-10-07 Thread Erich Titl
Hi Yves at 07.10.2012 19:08, Yves Blusseau wrote: > ... >> >> Note that the snapshot pointed to by the final commit you end up with, >> whether it’s the last of the rebased commits for a rebase or the final >> merge commit after a merge, is the same snapshot — it’s only the history >> that is dif

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-07 Thread Yves Blusseau
Le 7 oct. 2012 à 00:37, Erich Titl a écrit : > > Yes, but I needed a fork off of 4.3, not 4.3.1 > I hope this is possible, here a bit of ascii art > >o--o--o--o >/ \ > o--o--o--o--o--o--o--o > > It should be possible to to fork off in the past if needed. Of course >

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-07 Thread Yves Blusseau
Le 7 oct. 2012 à 00:50, Erich Titl a écrit : > on 06.10.2012 18:27, Yves Blusseau wrote: >> Erich this is for example some of the whitespace errors you have in your >> patches: >> http://dl.dropbox.com/u/112112/Screenshots/0zl_w0uz~4l7.png > > Nice, but why would GIT care. Because patches can

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-06 Thread Erich Titl
on 06.10.2012 18:27, Yves Blusseau wrote: > Erich this is for example some of the whitespace errors you have in your > patches: > http://dl.dropbox.com/u/112112/Screenshots/0zl_w0uz~4l7.png Nice, but why would GIT care. > > Also before merging a topic branch into an integration branch it's bett

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-06 Thread Erich Titl
Yves thanks for your answer on 06.10.2012 18:12, Yves Blusseau wrote: > > Le 6 oct. 2012 à 14:22, Erich Titl a écrit : > >> Hi Yves >> >> on 06.10.2012 10:07, Yves Blusseau wrote: >>>:$ >>> Le 5 oct. 2012 à 19:07, Erich Titl a écrit : >>> Hi Folks I have gotten at a point where

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-06 Thread Yves Blusseau
Erich this is for example some of the whitespace errors you have in your patches: http://dl.dropbox.com/u/112112/Screenshots/0zl_w0uz~4l7.png Also before merging a topic branch into an integration branch it's better to squash several commits into one or two. Your nameif integration take 4 commit

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-06 Thread Yves Blusseau
Le 6 oct. 2012 à 14:22, Erich Titl a écrit : > Hi Yves > > on 06.10.2012 10:07, Yves Blusseau wrote: >> >> Le 5 oct. 2012 à 19:07, Erich Titl a écrit : >> >>> Hi Folks >>> >>> I have gotten at a point where I want to push my stuff. >>> >>> @Yves could you have a look at my merge output to ju

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-06 Thread Erich Titl
Hi Yves on 06.10.2012 10:07, Yves Blusseau wrote: > > Le 5 oct. 2012 à 19:07, Erich Titl a écrit : > >> Hi Folks >> >> I have gotten at a point where I want to push my stuff. >> >> @Yves could you have a look at my merge output to just _guess_ if it >> looks OK >> >> mega@luna:~/leaf/devel/leaf.

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-06 Thread Yves Blusseau
Le 5 oct. 2012 à 19:07, Erich Titl a écrit : > Hi Folks > > I have gotten at a point where I want to push my stuff. > > @Yves could you have a look at my merge output to just _guess_ if it > looks OK > > mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git branch > maint > master > * nameif >

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-05 Thread Erich Titl
Hi Folks I have gotten at a point where I want to push my stuff. @Yves could you have a look at my merge output to just _guess_ if it looks OK mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git branch maint master * nameif mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git checkout maint M

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-04 Thread Erich Titl
KP on 04.10.2012 19:57, KP Kirchdoerfer wrote: ... >>> >> >> It is completely up to the user, my firewalls used the legacy settings >> form the past and I will definitely not touch my firewall builder >> database when moving to a new version of BuC. >> >> We should deliver an empty mactab file. >

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-04 Thread KP Kirchdoerfer
Am 04.10.2012 16:39, schrieb Erich Titl: > Yves > > at 04.10.2012 15:05, Yves Blusseau wrote: > ... >>> >> Or we can use another name that ethX ? >> >> em000:10:f3:08:4d:8b >> em100:10:f3:08:4d:8c >> em200:10:f3:08:4d:8d >> em300:10:f3:08:4d:8e >> e

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-04 Thread Erich Titl
Yves at 04.10.2012 15:05, Yves Blusseau wrote: ... >> > Or we can use another name that ethX ? > > em000:10:f3:08:4d:8b > em100:10:f3:08:4d:8c > em200:10:f3:08:4d:8d > em300:10:f3:08:4d:8e > em400:10:f3:08:4d:8f > em500:10:f3

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-04 Thread Yves Blusseau
Le 04/10/2012 11:13, Erich Titl a écrit : > Hi Folks > > First reports on the nameif applet, basically it does what one would > expect, e.g. renaming the interfaces. > > Prerequisites > > - The interface cannot be up when being renamed > > - There is no dynamic behaviour, but that was to be expecte

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-04 Thread Erich Titl
Hi Folks First reports on the nameif applet, basically it does what one would expect, e.g. renaming the interfaces. Prerequisites - The interface cannot be up when being renamed - There is no dynamic behaviour, but that was to be expected. - The interface order is kept, e.g. interface #12 rema

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-03 Thread Yves Blusseau
Le 03/10/2012 11:02, Erich Titl a écrit : > > I looked at your reply to the multiple build environment stuff and don't > see how you handle that without having two trees. It is not really a GIT > problem but a problem of the moving target 'build environment'. Most > developers don't care, as they a

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-03 Thread Yves Blusseau
Le 03/10/2012 13:48, Erich Titl a écrit : Hi everybody Just to be inline with current settings I did what I had to do to build my initrd files, committed it to my branch forked off of master v4.3 So master should be untouched and clean [1]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-03 Thread KP Kirchdoerfer
HI Erich; just to be shure you've branched nameif from maint and not master? Am 03.10.2012 14:16, schrieb Erich Titl: > Hi everybody > > Thanks for bearing with me, I convinced git to behave like I wanted > (until now) , e.g. I have a branch called nameif off the tag v4.3 in > maint which is tr

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-03 Thread Erich Titl
Hi everybody Thanks for bearing with me, I convinced git to behave like I wanted (until now) , e.g. I have a branch called nameif off the tag v4.3 in maint which is tracking origin/maint (I believe). mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git branch maint master * nameif mega@luna:~/l

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-03 Thread Erich Titl
Hi everybody Just to be inline with current settings I did what I had to do to build my initrd files, committed it to my branch forked off of master v4.3 So master should be untouched and clean mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git add repo/busybox/.config mega@luna:~/leaf/devel/le

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-02 Thread Erich Titl
Hi Yves Thanks for the quick reply. at 02.10.2012 16:55, Yves Blusseau wrote: > Le 02/10/2012 16:01, Erich Titl a écrit : >> Hi folks >> > ... > > About git you can clone the project with: > git clone > ssh:///USERNAME/@leaf.git.sourceforge.net/gitroot/leaf/bering-uclibc > > The branch for B

Re: [leaf-devel] BuC 4.3 interface naming

2012-10-02 Thread Yves Blusseau
Le 02/10/2012 16:01, Erich Titl a écrit : > Hi folks > > As you have lost me a long time ago in the GIT mist. I will have to make > a few shortcuts to keep up, as I am missing stuff in BuC 4.3 which, to > me, are showstoppers and I guess I will have to do this myself. > > Simple question > What

[leaf-devel] BuC 4.3 interface naming

2012-10-02 Thread Erich Titl
Hi folks As you have lost me a long time ago in the GIT mist. I will have to make a few shortcuts to keep up, as I am missing stuff in BuC 4.3 which, to me, are showstoppers and I guess I will have to do this myself. Simple question What is the current repository situation and how do I get a