[leaf-devel] new tool: setup-builddir

2012-08-26 Thread Yves Blusseau
Hi all, i have added a new tool: tool/setup-builddir and associate a makefile variable to it: $(BT_SETUP_BUILDDIR) This tool help to uncompress source tarball in build directory. In the buildtool.mk you can rewrite all: bzcat $(XXX_SOURCE) | tar -xvf - or zcat $(XXX_SOURCE) | ta

Re: [leaf-devel] [Git] Rewinding next branch

2012-08-26 Thread Yves Blusseau
> Ok, I'll make more verbose comments to commits. > P.S. swap is required for zram support - I should rebase > andrew/zram-support on top of andrew/enable-swap? Yes you can do that even if it not great. Do: git checkout andrew/zram-support git rebase --onto andrew/enable-swap master Then merge

Re: [leaf-devel] [Git] Rewinding next branch

2012-08-26 Thread Andrew
26.08.2012 19:32, Yves Blusseau пишет: > Le 26 août 2012 à 17:24, Yves Blusseau a écrit : > >> As git cherry -v master give me: >> >> + 0306cd0 enabled mkswap and swapon/swapoff applets in bb >> + f662339 Disabled patch that removes swap stats (now swap is on by default) >> + 90ff671 fixed upnpd as

Re: [leaf-devel] [Git] Rewinding next branch

2012-08-26 Thread KP Kirchdoerfer
Am 26.08.2012 18:32, schrieb Yves Blusseau: > > Le 26 août 2012 à 17:24, Yves Blusseau a écrit : > >> As git cherry -v master give me: >> >> + 0306cd0 enabled mkswap and swapon/swapoff applets in bb >> + f662339 Disabled patch that removes swap stats (now swap is on by default) >> + 90ff671 fixe

Re: [leaf-devel] [Git] Rewinding next branch

2012-08-26 Thread Yves Blusseau
Le 26 août 2012 à 17:24, Yves Blusseau a écrit : > As git cherry -v master give me: > > + 0306cd0 enabled mkswap and swapon/swapoff applets in bb > + f662339 Disabled patch that removes swap stats (now swap is on by default) > + 90ff671 fixed upnpd assembly > + b3ec368 added userland zram suppor

[leaf-devel] [Git] Rewinding next branch

2012-08-26 Thread Yves Blusseau
As git cherry -v master give me: + 0306cd0 enabled mkswap and swapon/swapoff applets in bb + f662339 Disabled patch that removes swap stats (now swap is on by default) + 90ff671 fixed upnpd assembly + b3ec368 added userland zram support; some init script rework + 027d722 removed unneeded delay; ad

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread KP Kirchdoerfer
Am 26.08.2012 17:01, schrieb Yves Blusseau: > > Le 26 août 2012 à 16:47, KP Kirchdoerfer a écrit : > >> Am 26.08.2012 16:33, schrieb Yves Blusseau: > > So good ! > Yes i will switch again 2.22. But if all is ok we can merge the commit > into master (with the "same" parent). So a

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread Yves Blusseau
Le 26 août 2012 à 16:47, KP Kirchdoerfer a écrit : > Am 26.08.2012 16:33, schrieb Yves Blusseau: So good ! Yes i will switch again 2.22. But if all is ok we can merge the commit into master (with the "same" parent). So andrew can you commit your topic branch directly i

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread KP Kirchdoerfer
Am 26.08.2012 16:33, schrieb Yves Blusseau: >>> >>> So good ! >>> Yes i will switch again 2.22. But if all is ok we can merge the commit into >>> master (with the "same" parent). So andrew can you commit your topic branch >>> directly into master (no cherry-pick). You must merge the same topic b

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread Yves Blusseau
>> >> So good ! >> Yes i will switch again 2.22. But if all is ok we can merge the commit into >> master (with the "same" parent). So andrew can you commit your topic branch >> directly into master (no cherry-pick). You must merge the same topic branch >> that you use to commit into next. If yo

Re: [leaf-devel] zswap

2012-08-26 Thread Andrew
26.08.2012 17:24, KP Kirchdoerfer пишет: > Am 26.08.2012 12:46, schrieb Andrew: >> 26.08.2012 13:37, KP Kirchdoerfer пишет: >>> Hi Andrew; >>> >>> Enabling zswap in leaf.cfg does not work. >>> >>> + chmod 1777 /var/lock >>> + chmod 1777 /tmp >>> + [ 10M -ge 0 ] >>> sh: 10M: bad number >>> >>> The l

Re: [leaf-devel] separate awk

2012-08-26 Thread KP Kirchdoerfer
Am 25.08.2012 22:22, schrieb Andrew: > 25.08.2012 23:02, KP Kirchdoerfer пишет: >> Am 25.08.2012 21:47, schrieb Andrew: >>> 25.08.2012 22:30, KP Kirchdoerfer пишет: Am 25.08.2012 21:20, schrieb Andrew: > 25.08.2012 22:12, KP Kirchdoerfer пишет: >> Am 25.08.2012 17:29, schrieb Andrew: >

Re: [leaf-devel] zswap

2012-08-26 Thread KP Kirchdoerfer
Am 26.08.2012 12:46, schrieb Andrew: > 26.08.2012 13:37, KP Kirchdoerfer пишет: >> Hi Andrew; >> >> Enabling zswap in leaf.cfg does not work. >> >> + chmod 1777 /var/lock >> + chmod 1777 /tmp >> + [ 10M -ge 0 ] >> sh: 10M: bad number >> >> The line in leaf.cfg is >> >> zswap=10M >> >> kp >> > Hi. >

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread KP Kirchdoerfer
Am 26.08.2012 15:02, schrieb Yves Blusseau: > > Le 26 août 2012 à 12:10, Andrew a écrit : > >> 26.08.2012 12:20, KP Kirchdoerfer пишет: >>> Hi Yves; >>> >>> Am 26.08.2012 10:40, schrieb Yves Blusseau: Hi @KP, like the merge commit in master, your last merge commit (f010890d) is

[leaf-devel] [Git] use of next branch

2012-08-26 Thread Yves Blusseau
Hi all, i made this mail because i see a lot of commit in next branches without any topic branch. It's ok if you keep your topic branches private, but it's bad if you commit directly in next branch. The next branch must not be used to fix or add new feature. It's an experimental branch that can

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread Yves Blusseau
Le 26 août 2012 à 12:10, Andrew a écrit : > 26.08.2012 12:20, KP Kirchdoerfer пишет: >> Hi Yves; >> >> Am 26.08.2012 10:40, schrieb Yves Blusseau: >>> Hi >>> >>> @KP, like the merge commit in master, your last merge commit (f010890d) is >>> really strange: >>> Merge branch 'next' of >>> s

Re: [leaf-devel] zswap

2012-08-26 Thread Andrew
26.08.2012 13:37, KP Kirchdoerfer пишет: > Hi Andrew; > > Enabling zswap in leaf.cfg does not work. > > + chmod 1777 /var/lock > + chmod 1777 /tmp > + [ 10M -ge 0 ] > sh: 10M: bad number > > The line in leaf.cfg is > > zswap=10M > > kp > Hi. Yes, I missed suffix support. I fixed this into git. You

[leaf-devel] zswap

2012-08-26 Thread KP Kirchdoerfer
Hi Andrew; Enabling zswap in leaf.cfg does not work. + chmod 1777 /var/lock + chmod 1777 /tmp + [ 10M -ge 0 ] sh: 10M: bad number The line in leaf.cfg is zswap=10M kp -- Live Security Virtual Conference Exclusive live

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread Andrew
26.08.2012 12:20, KP Kirchdoerfer пишет: > Hi Yves; > > Am 26.08.2012 10:40, schrieb Yves Blusseau: >> Hi >> >> @KP, like the merge commit in master, your last merge commit (f010890d) is >> really strange: >> Merge branch 'next' of >> ssh://leaf.git.sourceforge.net/gitroot/leaf/bering-uclibc

Re: [leaf-devel] Merges commit in next

2012-08-26 Thread KP Kirchdoerfer
Hi Yves; Am 26.08.2012 10:40, schrieb Yves Blusseau: > Hi > > @KP, like the merge commit in master, your last merge commit (f010890d) is > really strange: > Merge branch 'next' of > ssh://leaf.git.sourceforge.net/gitroot/leaf/bering-uclibc into next > > In next we must only see merge from

[leaf-devel] Merges commit in next

2012-08-26 Thread Yves Blusseau
Hi @KP, like the merge commit in master, your last merge commit (f010890d) is really strange: Merge branch 'next' of ssh://leaf.git.sourceforge.net/gitroot/leaf/bering-uclibc into next In next we must only see merge from master or topic branches. I don't understand this merge.. Perhaps you