From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: bug#36747: Official MesCC bootstrap binaries differ from my locally built ones Date: Wed, 14 Aug 2019 17:03:55 +0200 Message-ID: <8736i3iyas.fsf@devup.no> References: <875znwcoo9.fsf@netris.org> <87ef2j1pgt.fsf@gnu.org> <87ftmy51kk.fsf@netris.org> <87muh6sib4.fsf@gnu.org> <877e8a79mz.fsf@netris.org> <87pnm2ufv1.fsf@gnu.org> <87lfwpqpb7.fsf@netris.org> <875znt2hlc.fsf@gnu.org> <87zhke97xj.fsf@netris.org> <87h86mdaex.fsf@gnu.org> <8736i5a7mb.fsf@netris.org> <87mugdbc9r.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:37403) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxupk-0007qD-H3 for bug-guix@gnu.org; Wed, 14 Aug 2019 11:05:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxupi-00019z-RT for bug-guix@gnu.org; Wed, 14 Aug 2019 11:05:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40763) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hxupi-00019u-Nf for bug-guix@gnu.org; Wed, 14 Aug 2019 11:05:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <87mugdbc9r.fsf@gnu.org> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Jan Nieuwenhuizen , Mark H Weaver Cc: 36747@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Jan Nieuwenhuizen writes: > Mark H Weaver writes: > > Hi Mark, > >>> I called that `wip-binaries', @master from three weeks ago. >> >> Thank you, that was a good start. I found that some additional patches >> were needed to match the bootstrap binaries that 'core-updates' is >> currently based on. >> >> I ended up deleting and repushing a revised 'wip-binaries' to Savannah. >> It includes slightly modified versions of the two commits you had >> included, as well as some additional cherry-picked commits of yours to >> update mescc-tools and add linux-libre-headers-bootstrap-tarball, and a >> few of my own. > > Very nice. > >> I built the new bootstrap tarballs at the new 'wip-binaries', commit >> c67becb31c30a5cd7685f166970ac4793e3a34a9, and here's what I got: >> >> mhw@jojen ~/guix-wip-binaries$ git describe >> v1.0.1-2404-gc67becb31c >> mhw@jojen ~/guix-wip-binaries$ ./pre-inst-env guix build --system=i686-linux bootstrap-tarballs >> /gnu/store/bg086i2qw1fn2jgbd15d9v91hyjrjsb2-bootstrap-tarballs-0 >> mhw@jojen ~/guix-wip-binaries$ cd /gnu/store/bg086i2qw1fn2jgbd15d9v91hyjrjsb2-bootstrap-tarballs-0 >> mhw@jojen /gnu/store/bg086i2qw1fn2jgbd15d9v91hyjrjsb2-bootstrap-tarballs-0$ sha256sum * >> 3e50c070a100b6bcf84c4bf5c868f9cd0a9fd1570f5d82fbfb78f8411959091b guile-static-stripped-2.2.4-i686-linux.tar.xz >> 1acd8f83e27d2fac311a5ca78e9bf11a9a1638b82469870d5c854c4e7afaa26a linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz >> 021543d9bb6af55f39e68d69692e3cb74646ced2cad0bb9ac0047ef81e9d7330 mescc-tools-static-stripped-0.5.2-0.bb062b0-i686-linux.tar.xz >> fb32090071b39fc804fb9a7fba96f0bc5eb844a0efd268fb24c42e6bfa959de0 mes-minimal-stripped-0.19-i686-linux.tar.xz >> c80cdd17b0a24eebdd75570ff72c4ec06e129bd702ac008186b57f6301c448e7 static-binaries-0-i686-linux.tar.xz > >> Can you try "guix build --system=i686-linux bootstrap-tarballs" at the >> new 'wip-binaries' branch and see if you get the same results? > > Yes, on c67becb31c30a5cd7685f166970ac4793e3a34a9 running > "./pre-inst-env guix build --system=i686-linux bootstrap-tarballs" gives me exactly this, > also for guile-static-stripped! \o/ > >> Also, I have a question: One of the changes I made to 'wip-binaries' was >> to update mescc-tools to 0.5.2-0.bb062b0, to match the >> %bootstrap-mescc-tools that's currently being used in 'core-updates'. >> >> However, I noticed that you have also apparently built the official >> release of mescc-tools-0.5.2, which is on your site: >> >> http://lilypond.org/janneke/guix/20190722/mescc-tools-static-stripped-0.5.2-i686-linux.tar.xz >> >> and that this tarball is identical to the build output of the later git >> commit: mescc-tools-static-stripped-0.5.2-0.bb062b0-i686-linux.tar.xz. >> >> With this in mind, could we just use 0.5.2? What changed between 0.5.2 >> and 0.5.2-0.bb062b0, and what was the rationale for updating to bb062b0? > > Good catch. We probably can, we might try that. > > I think the need for updating to bb062b0 has been removed during the > review of the integration of the reduced binary seed bootstrap into > core-updates by Ludovic. > > For historical reasons, I think this mescc-tools commit > > --8<---------------cut here---------------start------------->8--- > commit c184e95096881a13f29ebd7fc507fe305d3d8de5 (gitlab/janneke, janneke) > Author: Jan Nieuwenhuizen > Date: Thu Oct 4 22:03:31 2018 +0200 > > build.sh: Update for mes 0.18. > --8<---------------cut here---------------end--------------->8--- > > was needed at a time that we did not have mescc-tools or mes in > bootstrap tarballs. We built bootstrap variants of mescc-tools and mes > using a externally (outside fo Guix) built mescc-tools-seed and > (an almost pure ASCII) mes-seed. I tried building the i686 bootstrap tarballs from wip-binaries with this additional patch: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=mes.diff Content-Transfer-Encoding: quoted-printable diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index e298cb05c1..380cac6c88 100644 =2D-- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -139,33 +139,31 @@ Guile.") (license gpl3+))) =20 (define-public mescc-tools =2D (let ((commit "bb062b0da7bf2724ca40f9002b121579898d4ef7") =2D (revision "0") =2D (version "0.5.2")) =2D (package =2D (name "mescc-tools") =2D (version (string-append version "-" revision "." (string-take comm= it 7))) =2D (source (origin =2D (method url-fetch) =2D (uri (string-append =2D "https://git.savannah.nongnu.org/cgit/mescc-tools.= git/snapshot/" =2D name "-" commit =2D ".tar.gz")) =2D (sha256 =2D (base32 =2D "1h6j57wyf91i42b26f8msbv6451cw3nm4nmpl1fckp9c7vi8mwkh"= )))) =2D (build-system gnu-build-system) =2D (supported-systems '("i686-linux" "x86_64-linux")) =2D (arguments =2D `(#:make-flags (list (string-append "PREFIX=3D" (assoc-ref %outpu= ts "out"))) =2D #:test-target "test" =2D #:phases (modify-phases %standard-phases =2D (delete 'configure)))) =2D (synopsis "Tools for the full source bootstrapping process") =2D (description =2D "Mescc-tools is a collection of tools for use in a full source + (package + (name "mescc-tools") + (version "0.5.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://git.savannah.nongnu.org/cgit/mescc-tools.git/= snapshot/" + name "-Release_" version + ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01x7bhmgwyf6mc2g1hcvibhps98nllacqm4f0j5l51b1mbi18pc2")))) + (build-system gnu-build-system) + (supported-systems '("i686-linux" "x86_64-linux")) + (arguments + `(#:make-flags (list (string-append "PREFIX=3D" (assoc-ref %outputs "= out"))) + #:test-target "test" + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (synopsis "Tools for the full source bootstrapping process") + (description + "Mescc-tools is a collection of tools for use in a full source bootstrapping process. It consists of the M1 macro assembler, the hex2 linker, the blood-elf symbol table generator, the kaem shell, exec_enable = and get_machine.") (home-page "https://savannah.nongnu.org/projects/mescc-tools") =2D (license gpl3+)))) + (license gpl3+))) --=-=-= Content-Type: text/plain And got this result: $ cd /gnu/store/rdwyr8mh7dvhfkb5g4cws6q40hp23rbi-bootstrap-tarballs-0 $ sha256sum * 3e50c070a100b6bcf84c4bf5c868f9cd0a9fd1570f5d82fbfb78f8411959091b guile-static-stripped-2.2.4-i686-linux.tar.xz 1acd8f83e27d2fac311a5ca78e9bf11a9a1638b82469870d5c854c4e7afaa26a linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz 021543d9bb6af55f39e68d69692e3cb74646ced2cad0bb9ac0047ef81e9d7330 mescc-tools-static-stripped-0.5.2-i686-linux.tar.xz fb32090071b39fc804fb9a7fba96f0bc5eb844a0efd268fb24c42e6bfa959de0 mes-minimal-stripped-0.19-i686-linux.tar.xz c80cdd17b0a24eebdd75570ff72c4ec06e129bd702ac008186b57f6301c448e7 static-binaries-0-i686-linux.tar.xz I also merged the branch to core-updates and reverted the bash patch, which produced this derivation for "guix build -d -s i686-linux bootstrap-tarballs": /gnu/store/ld82vli1msfrlimjaryznrqcwm0jc5ii-bootstrap-tarballs-0.drv I will report back with hashes once it finishes building. It would be great if someone else could try to resolve the merge and see if they get the same derivation. --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl1UItsACgkQoqBt8qM6 VPqTUAf+KginaSq7wY/hWl+fb1Mz9mCWAJsReukB7pnVvV081ESR65pXc7NuMkZq B1S1FguPrB6pu68l9JdhfwLFSSjX0GfIS+9kVL7OyjNWA6HFHjiuq+o0XjMPomPz 03Kc8yyC+n9nMYJe6nGsC12WZ6ktVnEQhCCwUw74BjvxgUx5/DJ4XQ/V68Qt+YH0 1onByXaxMrDhBd8JpGUAUPRO/Cmh8vQAlGXkE+asrRmHH1BBv6lb1mlGS46XMTSg dOrxA+nLmxrk/HUycmY/S9Q1OgDKKlNDBub8zlnZmnnJ3hSe5v8wdITZjBS+qHAP RXL4zuAI3mVWFo5vQQlsTG0ndNCF0g== =UXHE -----END PGP SIGNATURE----- --==-=-=--