02/15: bootstrap: Use x86_64-linux bootstrap tarballs for x86_64-linux.

[guix-commits]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit a3a182e2b7a3dc60ba248481d1dd0aefe80a38ce
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sat Nov 24 08:49:48 2018 +0100

    bootstrap: Use x86_64-linux bootstrap tarballs for x86_64-linux.
    
    Built with
    
        4ae7dc7b9af64794081b1913740b97acd89c91bc
        gnu: Remove duplicate linux-libre-headers package from bootstrap inputs.
    
    * gnu/packages/bootstrap.scm (%bootstrap-linux-libre-headers): Update,
    for x86_64-linux, use x86_64-linux tarball (was: i686-linux tarball).
    (%bootstrap-mescc-tools): Likewise.
    (%bootstrap-mes): Likewise.
---
 gnu/packages/bootstrap.scm | 73 +++++++++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 93e9d8d..a835cbc 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -406,13 +406,19 @@ $out/bin/guile --version~%"
      (origin
        (method url-fetch)
        (uri (match system
-              ((or "i686-linux"
-                   "x86_64-linux")
-               
"http://lilypond.org/janneke/mes/linux-libre-headers-stripped-4.14.26-i686-linux.tar.xz";)
-              (_ (error "linux-libre-headers-bootstrap: system not 
supported"))))
+              ("i686-linux"
+               (string-append
+                "http://lilypond.org/janneke/guix/20181124/";
+                "linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz"))
+              ("x86_64-linux"
+               (string-append
+                "http://lilypond.org/janneke/guix/20181124/";
+                "linux-libre-headers-stripped-4.14.67-x86_64-linux.tar.xz"))
+              (_ (error "linux-libre-headers-bootstrap: system not supported:"
+                        (%current-system)))))
        (sha256
         (base32
-         "0nwspwydn089xbd28nnas762iwl6l9ymbcz170qvfi50ywgim1ma"))))
+         "0sm2z9x4wk45bh6qfs94p0w1d6hsy6dqx9sw38qsqbvxwa1qzk8s"))))
    #f                                   ; no program to test
    "Bootstrap linux-libre-headers"))
 
@@ -646,18 +652,22 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
     (inputs
      `(("tar" ,(search-bootstrap-binary "tar" (%current-system)))
        ("xz"  ,(search-bootstrap-binary "xz" (%current-system)))
-       ("tarball" ,(bootstrap-origin
-                    (origin
-                      (method url-fetch)
-                      (uri (string-append
-                            "http://lilypond.org/janneke/mes/";
-                            (match (%current-system)
-                              ((or "i686-linux" "x86_64-linux")
-                               
"mescc-tools-static-0.5.2-0.bb062b0-i686-linux.tar.xz"))))
-                      (sha256
-                       (match (%current-system)
-                         ((or "i686-linux" "x86_64-linux")
-                          (base32 
"0dkwl8mjmmizx7gba9spiq9sp8c5fqv7370qakggy5nxpply59jh")))))))))
+       ("tarball"
+        ,(bootstrap-origin
+          (origin
+            (method url-fetch)
+            (uri (string-append
+                  "http://lilypond.org/janneke/guix/20181124/";
+                  (match (%current-system)
+                    ("i686-linux"
+                     "mescc-tools-static-0.5.2-0.bb062b0-i686-linux.tar.xz")
+                    ("x86_64-linux"
+                     "mescc-tools-static-0.5.2-0.bb062b0-x86_64-linux.tar.xz")
+                    (_ (error "bootstrap-mescc-tools: system not supported:"
+                              (%current-system))))))
+            (sha256
+             (base32
+              "11lniw0vg61kmyhvnwkmcnkci9ym6hbmiksiqggd0hkipbq7hvlz")))))))
     (synopsis "Bootstrap binaries of MesCC Tools")
     (description synopsis)
     (home-page #f)
@@ -694,19 +704,22 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
     (inputs
      `(("tar" ,(search-bootstrap-binary "tar" (%current-system)))
        ("xz"  ,(search-bootstrap-binary "xz" (%current-system)))
-       ("tarball" ,(bootstrap-origin
-                    (origin
-                      (method url-fetch)
-                      (uri (string-append
-                            "http://lilypond.org/janneke/mes/";
-                            (match (%current-system)
-                              ((or "i686-linux" "x86_64-linux")
-                               
"mes-minimal-stripped-0.18-0.08f04f5-i686-linux.tar.xz"))))
-                      (sha256
-                       (match (%current-system)
-                         ((or "i686-linux" "x86_64-linux")
-                          (base32
-                           
"0qwpby91hp6afmg5ibdrrk3fw85zxdazfk7rhrdsihsfzqwmfhfx")))))))))
+       ("tarball"
+        ,(bootstrap-origin
+          (origin
+            (method url-fetch)
+            (uri (string-append
+                  "http://lilypond.org/janneke/guix/20181124/";
+                  (match (%current-system)
+                    ("i686-linux"
+                     "mes-minimal-stripped-0.18-0.08f04f5-i686-linux.tar.xz")
+                    ("x86_64-linux"
+                     
"mes-minimal-stripped-0.18-0.08f04f5-x86_64-linux.tar.xz"))))
+            (sha256
+             (match (%current-system)
+               ((or "i686-linux" "x86_64-linux")
+                (base32
+                 
"0qwpby91hp6afmg5ibdrrk3fw85zxdazfk7rhrdsihsfzqwmfhfx")))))))))
     (synopsis "Bootstrap binaries of Mes")
     (description synopsis)
     (home-page #f)