Re: busybox v. 1.18.3
On Wed, Feb 23, 2011 at 20:22, Michael Tokarev wrote: ... > I'm refreshing all patches now as suggested by Cristian Greco, > now against 1.18 tree, -- in order to make it buildable again. Good. I would like to thank you and Christian for this works. > My first attempt, let's hope subsequent attempts will > be more successful. Sure it will :-) -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/AANLkTim=hzc88znaRb1atXt+gpOjyo20=4tpepqc7...@mail.gmail.com
Re: busybox v. 1.18.3
23.02.2011 19:43, Otavio Salvador wrote: > On Wed, Feb 23, 2011 at 07:51, Michael Tokarev wrote: > ... >> As I mentioned already, there was no _config_ changes in >> this 1.18 package compared with 1.17, so the only possible >> changes are bugs introduced in busybox itself, but there >> should - hopefully - be none, and even if there are such >> bugs, we'll fix them later. > > IMO we ought to merge Chris changes first (that are not refreshing > already merged patches) and then merge 1.18. For uploading I'd like to > get current busybox ready for testing before uploading to sid a new > one. > > Seems fine? If it does, can you prepare it all in a branch for we to merge? So we ended up mergeing 5 out of 6 patches from Cristian Greco (except of the patch that refreshes all patches), and applying 1.18.3 changes into master branch. Now it's time to finally refresh the patches for good, for new release. Unfortunately the resulting git tree as it is now can't be built directly using apt/dpkg - dpkg-source uses diff with -F0 (disables fuzz factor), but the first patch applies with some fuzz - I didn't refresh it when applying 1.18, I just didn't know that fact -- quilt works just fine since it does not restrict patch to 'no fuzz'. This is something I especially tried to avoid, -- unbuildable commits, in order to not break git bisect. Now I understand how it happened (the result was that we removed references to quilt before my 1.18 changes). (Note it's trivial to work around this still, by running quilt manually). I'm refreshing all patches now as suggested by Cristian Greco, now against 1.18 tree, -- in order to make it buildable again. My first attempt, let's hope subsequent attempts will be more successful. Thanks! /mjt -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4d656c8c.4000...@msgid.tls.msk.ru
Re: busybox v. 1.18.3
On Wed, Feb 23, 2011 at 07:51, Michael Tokarev wrote: ... > As I mentioned already, there was no _config_ changes in > this 1.18 package compared with 1.17, so the only possible > changes are bugs introduced in busybox itself, but there > should - hopefully - be none, and even if there are such > bugs, we'll fix them later. IMO we ought to merge Chris changes first (that are not refreshing already merged patches) and then merge 1.18. For uploading I'd like to get current busybox ready for testing before uploading to sid a new one. Seems fine? If it does, can you prepare it all in a branch for we to merge? -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/aanlktimy-zj1edp4g3mtr-0hyenvoxcuhp_3xwnfs...@mail.gmail.com
Re: busybox v. 1.18.3
[Replying to an old(ish) email which I didn't notice somehow] 16.02.2011 00:41, Joey Hess wrote: > Michael Tokarev wrote: >> this is first refresh of new upstream (1.18) branch, >> currently at 1.18.3. > > Speaking of upstream, since busybox upstream is in git, it > can easily be merged into our repository. For example: > > git remote add upstream git://git.busybox.net/busybox > git pull upstream > git merge upstream/1_18_stable I think that will be good thing, yes. But it is not mandatory, obviously. > Merging that with your branch allows it to build > without needing to faff with tarballs. Would it make sense > to include upstream source in our busybox repo now that > it's in git? It would be more consistent with the rest of d-i, > although bb is still the only package in d-i that has a > separate upstream source. > > Here is a d-i mini.iso built with the new busybox. I have not > had a chance to boot it up and see if it installs. That would > be a good test, before upgrading busybox. > > http://kitenet.net/~joey/tmp/mini.iso That thing appears to be working somehow. At least basic install and rescue mode, some stuff in advanced mode - all work fine as far as I can see. As I mentioned already, there was no _config_ changes in this 1.18 package compared with 1.17, so the only possible changes are bugs introduced in busybox itself, but there should - hopefully - be none, and even if there are such bugs, we'll fix them later. Thanks! /mjt -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4d64bc87.6070...@msgid.tls.msk.ru
Re: busybox v. 1.18.3
On Tue, Feb 15, 2011 at 21:41, Joey Hess wrote: > Michael Tokarev wrote: >> this is first refresh of new upstream (1.18) branch, >> currently at 1.18.3. ... > Merging that with your branch allows it to build > without needing to faff with tarballs. Would it make sense > to include upstream source in our busybox repo now that > it's in git? It would be more consistent with the rest of d-i, > although bb is still the only package in d-i that has a > separate upstream source. ... I think it would be nice since it would allow for us to grep to code and track upstream changes more easily. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/AANLkTi=icmxs-xh65mfb0sb4hqu6ef2el8dspwdde...@mail.gmail.com
Re: busybox v. 1.18.3
Michael Tokarev wrote: > this is first refresh of new upstream (1.18) branch, > currently at 1.18.3. Speaking of upstream, since busybox upstream is in git, it can easily be merged into our repository. For example: git remote add upstream git://git.busybox.net/busybox git pull upstream git merge upstream/1_18_stable Merging that with your branch allows it to build without needing to faff with tarballs. Would it make sense to include upstream source in our busybox repo now that it's in git? It would be more consistent with the rest of d-i, although bb is still the only package in d-i that has a separate upstream source. Here is a d-i mini.iso built with the new busybox. I have not had a chance to boot it up and see if it installs. That would be a good test, before upgrading busybox. http://kitenet.net/~joey/tmp/mini.iso -- see shy jo signature.asc Description: Digital signature
Re: busybox v. 1.18.3
15.02.2011 10:43, Michael Tokarev пишет: > 15.02.2011 09:08, Christian PERRIER wrote: >> Quoting Michael Tokarev (m...@tls.msk.ru): >> >>> size on i386: >>> textdata bss dec hex filename >>>40344917908988 414227 65213 busybox-1.17.1 >>>42031617878984 431087 693ef busybox-1.18.3 >> >> (cc'ing you, still...not sure if you're subscribed to -boot) > > I subscribed to -boot back in November, in order > to help with busybox and other stuff. Setting > Reply-To appropriately. > >> Could you compare the size of the two udebs? > > Sure. For i386 arch: > >textdata bss dec hex filename > 21189314978684 222074 3637a busybox-1.17.1-9 > 22113414948684 231312 38790 busybox-1.18.3-1 And this is, in turn, not really accurate. I compared newly built busybox with the binaries as found in the debian squeeze archives. But after rebuilding 1.17 locally I see that my version is different. i386 udeb: textdata bss dec hex filename 21189314978684 222074 3637a busybox-1.17.1-9-squeeze 22174314978684 231924 389f4 busybox-1.17.1-9-mjt 22113414948684 231312 38790 busybox-1.18.3-1 i386 regular deb: textdata bss dec hex filename 40344917908988 414227 65213 busybox-1.17.1-9-squeeze 41878317908988 429561 68df9 busybox-1.17.1-9-mjt 42031617878984 431087 693ef busybox-1.18.3-1 I'll try to find why my environment produces so different binaries (as compared to the build boxes). Currently (at least speaking of development environment - gcc, binutils and around) I've standard squeeze i386 install. > Note again - the config has not changed at all, all new > applets are disabled. /mjt -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4d5a4899.5040...@msgid.tls.msk.ru
Re: busybox v. 1.18.3
15.02.2011 09:08, Christian PERRIER wrote: > Quoting Michael Tokarev (m...@tls.msk.ru): > >> size on i386: >> textdata bss dec hex filename >>40344917908988 414227 65213 busybox-1.17.1 >>42031617878984 431087 693ef busybox-1.18.3 > > (cc'ing you, still...not sure if you're subscribed to -boot) I subscribed to -boot back in November, in order to help with busybox and other stuff. Setting Reply-To appropriately. > Could you compare the size of the two udebs? Sure. For i386 arch: textdata bss dec hex filename 21189314978684 222074 3637a busybox-1.17.1-9 22113414948684 231312 38790 busybox-1.18.3-1 Note again - the config has not changed at all, all new applets are disabled. > Great work, Michael (I can't really comment on the details...most > being out of my field of expertise, but very obviously you did things > carefully). Thank you. Not really great -- this is something I did and still do on a regular basis since I maintain several boot-related packages locally (including kernel, busybox and mkinitrd), and I'd love to be able to use Debian packages for the same (they're not as flexible yet). /mjt -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4d5a2eb6.4000...@msgid.tls.msk.ru
Re: busybox v. 1.18.3
Quoting Michael Tokarev (m...@tls.msk.ru): > size on i386: > textdata bss dec hex filename >40344917908988 414227 65213 busybox-1.17.1 >42031617878984 431087 693ef busybox-1.18.3 (cc'ing you, still...not sure if you're subscribed to -boot) Could you compare the size of the two udebs? Great work, Michael (I can't really comment on the details...most being out of my field of expertise, but very obviously you did things carefully). signature.asc Description: Digital signature
Re: busybox v. 1.18.3
14.02.2011 22:44, Michael Tokarev wrote: > Please pull from > > git://git.corpit.ru/busybox-debian.git bb-1.18 > > this is first refresh of new upstream (1.18) branch, > currently at 1.18.3. > > All applicable patches refreshed, all merged patches > are dropped (all verified - yes, they were all merged, > some slightly differently), configs refreshed but all > new options are disabled for now (needs a global review > anyway). > > Diffstat: [] The diffstat is reversed. Please excuse me for this. Real diffstat: debian/changelog | 35 +- debian/config/pkg/deb | 57 +- debian/config/pkg/static | 56 +- debian/config/pkg/udeb | 58 +- debian/patches/blockdev.patch | 210 - ...otchartd-mounting-tmpfs-is-Linux-specific.patch | 66 -- ...erial-console-detection-is-Linux-specific.patch | 60 -- debian/patches/doc-man-name.patch | 24 - debian/patches/init-console-CRTSCTS.patch | 15 - .../init-halt-portability-improvements.patch | 185 ...init-loginutils-termios-portability-fixes.patch | 199 - ...-make-the-initial-TERM-value-configurable.patch | 51 -- .../klogd-make-it-work-on-non-linux-systems.patch | 246 -- ...ve-misguided-dependency-on-PLATFORM_LINUX.patch | 27 - ...nditionalize-AF_-usage-in-error-reporting.patch | 44 - ...b.h-add-device-names-for-Hurd-and-FreeBSD.patch | 58 -- .../patches/make_gen_build_files_skip_quilt.patch | 14 +- ...mark-Linux-specific-configuration-options.patch | 915 debian/patches/mkdir-fix-p-on-FreeBSD.patch| 30 - debian/patches/readlink-use-xmalloc_realpath.patch | 50 -- debian/patches/series | 23 - .../stty-sort-out-preprocessor-conditionals.patch | 705 --- ...vd-conditionalize-usage-of-SO_ORIGINAL_DS.patch | 70 -- debian/patches/u-mount-FreeBSD-support.patch | 129 ++-- .../patches/update-scripts-kconfig-_shipped.patch | 28 - debian/patches/version.patch |2 +- ...able-linux-console-calls-on-other-systems.patch | 104 --- 27 files changed, 201 insertions(+), 3260 deletions(-) /mjt -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4d5987fc.2080...@msgid.tls.msk.ru
