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 support; some init script rework > + 027d722 removed unneeded delay; added mounting points to booting case when > root_size=0 (when initramfs is used) > + 0875dab oops... fixed zram configuration > + 7b4ee82 some initrd script logic rework > + 1bdfb7e added priority 100 to zram swap > + e1d4b5e moved libm into initrd; enabled awk busybox applet; removed strict > dependencies on mawk for packages (webconf ipv6 conntrack status and openswan > needs deeper testing) > + d8af352 bb config updated > + 691e9d5 moved conf/buildtool.conf template to conf/buildtool.conf.sample; > added code to copy conf/buildtool.conf.sample into conf/buildtool.conf if > conf/buildtool.conf is missing > + 70c675f added zswap size k/M/G suffix support > + 1920498 syntax fix in buildpacket > > This are all the commits in next that was not on master. > > So i will make some clean house and commit "small" changes directly in master > and "tests" thing in topic branches. > Then i will rewind next to master and apply test topics > > Please don't commit thing in next during this time. > > Regards, > Yves
Ok all done: - master branch update with some commits: * 2bf047a enabled awk busybox applet * 7b6ccf8 moved libm into initrd; removed strict dependencies on libm * 2e08835 removed unneeded delay; added mounting points to booting case when root_size=0 (when initramfs is used) * d2c0573 fixed upnpd assembly - next branch rewind to master and populate with topic branches: *andrew/enable-swap *andrew/zram-support *andrew/remove-mawk-dependencies @andrew, it was hard for me to see what's commit do. Can you explain exactly in the futur why a line is changed. For example: removed unneeded delay (what delay, where, for what ?) Also avoid to make different things in the same commit. Use git add -p to split the commit. For example: moved libm into initrd; enabled awk busybox applet; removed strict dependencies on mawk for packages (webconf ipv6 conntrack status and openswan needs deeper testing) I have split this commit into 2: one that remove dependencies to libm and another that remove dependencies to mawk. Also your commit message was false because it doesn't enable awk busy box applet (that was done in another commit). I also rewrote the commit bb config updated to enable awk busy box applet which is more what the commit do. Regards, Yves ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
