From 0f0995521393b9ec1733de3475bf74c89732e556 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 20 Dec 2012 01:33:29 +0100 Subject: distro: Update bootstrap binaries. Use bootstrap binaries that were generated with the `make-bootstrap' changes introduced in previous commit. * Makefile.am (nodist_bootstrap_x86_64_linux_DATA, nodist_bootstrap_i686_linux_DATA): Change Guile tarball name. (distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz, distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz): New targets. (distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz, distro/packages/bootstrap/i686-linux/guile-bootstrap-2.0.6.tar.xz): Remove. * build-aux/download.scm (file-name->uri): Use "20121219" directory. * distro/packages/bootstrap.scm (%bootstrap-guile): Update file name. (%bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Update directory name and hashes. --- build-aux/download.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build-aux') diff --git a/build-aux/download.scm b/build-aux/download.scm index 4c1a1a6e5d..f5d23f2701 100644 --- a/build-aux/download.scm +++ b/build-aux/download.scm @@ -35,7 +35,7 @@ (define (file-name->uri file) (match (string-tokenize file (char-set-complement (char-set #\/))) ((_ ... system basename) (string->uri (string-append %url-base "/" system - "/20121115/" basename))))) + "/20121219/" basename))))) (match (command-line) ((_ file expected-hash) -- cgit v1.2.3 From 79580eb698d07e4b21334ddfbcbcf620d27b5e41 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 6 Jan 2013 01:16:14 +0100 Subject: distro: Update bootstrap binaries to an nscd-less libc. Update bootstrap binaries following changes in commit d3b5972 ("Build glibc without nscd, and with static NSS modules.") * Makefile.am (distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz, distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz): Update hashes. * build-aux/download.scm (file-name->uri): Update URL. * distro/packages/bootstrap.scm (%bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Update URLs and hashes. --- Makefile.am | 4 ++-- build-aux/download.scm | 4 ++-- distro/packages/bootstrap.scm | 26 +++++++++++++------------- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'build-aux') diff --git a/Makefile.am b/Makefile.am index 2dca557b7a..41337fd272 100644 --- a/Makefile.am +++ b/Makefile.am @@ -164,10 +164,10 @@ DOWNLOAD_FILE = \ distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz: $(MKDIR_P) `dirname "$@"` - $(DOWNLOAD_FILE) "$@" "953fbcc8db6e310626be79b67319cf4141dc23b296447952a99d95425b3a4dc1" + $(DOWNLOAD_FILE) "$@" "bc43210dcd146d242bef4d354b0aeac12c4ef3118c07502d17ffa8d49e15aa2c" distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz: $(MKDIR_P) `dirname "$@"` - $(DOWNLOAD_FILE) "$@" "45d1f9bfb9e4531a8f1c5a105f7ab094cd481b8a179ccc63cbabb73ce6b8437f" + $(DOWNLOAD_FILE) "$@" "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c" nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm diff --git a/build-aux/download.scm b/build-aux/download.scm index f5d23f2701..aad4fe3c76 100644 --- a/build-aux/download.scm +++ b/build-aux/download.scm @@ -1,5 +1,5 @@ ;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- -;;; Copyright (C) 2012 Ludovic Courtès +;;; Copyright (C) 2012, 2013 Ludovic Courtès ;;; ;;; This file is part of Guix. ;;; @@ -35,7 +35,7 @@ (define (file-name->uri file) (match (string-tokenize file (char-set-complement (char-set #\/))) ((_ ... system basename) (string->uri (string-append %url-base "/" system - "/20121219/" basename))))) + "/20130105/" basename))))) (match (command-line) ((_ file expected-hash) diff --git a/distro/packages/bootstrap.scm b/distro/packages/bootstrap.scm index 222f087372..2d35d3cdce 100644 --- a/distro/packages/bootstrap.scm +++ b/distro/packages/bootstrap.scm @@ -1,5 +1,5 @@ ;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- -;;; Copyright (C) 2012 Ludovic Courtès +;;; Copyright (C) 2012, 2013 Ludovic Courtès ;;; ;;; This file is part of Guix. ;;; @@ -205,15 +205,15 @@ (define %bootstrap-coreutils&co (method url-fetch) (uri (string-append %bootstrap-base-url "/" - system "/20121219/static-binaries.tar.xz")) + system "/20130105/static-binaries.tar.xz")) (sha256 (match system ("x86_64-linux" (base32 - "1vvdr1hfbjxlincpgfwhz9l4mbrjf502bv5nivapk5b2d3xxfyvv")) + "0md23alzy6nc5f16pric7mkagczdzr8xbh074sb3rjzrls06j1ls")) ("i686-linux" (base32 - "18ky02ifa0w5afyil04fh5whlsqdw0h8kn2fkibfhwfsm5q9d5fx")))))) + "0nzj1lmm9b94g7k737cr4w1dv282w5nmhb53238ikax9r6pkc0yb")))))) "true" ; the program to test "Bootstrap binaries of Coreutils, Awk, etc.")) @@ -224,15 +224,15 @@ (define %bootstrap-binutils (method url-fetch) (uri (string-append %bootstrap-base-url "/" - system "/20121219/binutils-2.22.tar.xz")) + system "/20130105/binutils-2.22.tar.xz")) (sha256 (match system ("x86_64-linux" (base32 - "0ms6i035v40n7mhi91n4b8ivwv2qni3mcd5dj9sj9qmvgqb50r84")) + "1ffmk2yy2pxvkqgzrkzp3s4jpn4qaaksyk3b5nsc5cjwfm7qkgzh")) ("i686-linux" (base32 - "16yr3jxqjvd979vvpikfn4rl9fqrbcs5viwd2r8xzf5bakc2mq9p")))))) + "1rafk6aq4sayvv3r3d2khn93nkyzf002xzh0xadlyci4mznr6b0a")))))) "ld" ; the program to test "Bootstrap binaries of the GNU Binutils")) @@ -277,15 +277,15 @@ (define %bootstrap-glibc (origin (method url-fetch) (uri (string-append %bootstrap-base-url "/" system - "/20121219/glibc-2.16.0.tar.xz")) + "/20130105/glibc-2.17.tar.xz")) (sha256 (match system ("x86_64-linux" (base32 - "1mqpb2sxfa5whdq0adyrgg7j3ci5v4d42wna8hg4j3dbcr5b2vpi")) + "18kv1z9d8dr1j3hm9w7663kchqw9p6rsx11n1m143jgba2jz6jy3")) ("i686-linux" (base32 - "03wb29srsdswc775ppzwllys0dqyy235shm1n64jl6njw4l7c5x6")))))))))) + "08hv8i0axwnihrcgbz19x0a7s6zyv3yx38x8r29liwl8h82x9g88")))))))))) (synopsis "Bootstrap binaries and headers of the GNU C Library") (description #f) (home-page #f))) @@ -348,15 +348,15 @@ (define %bootstrap-gcc (origin (method url-fetch) (uri (string-append %bootstrap-base-url "/" system - "/20121219/gcc-4.7.2.tar.xz")) + "/20130105/gcc-4.7.2.tar.xz")) (sha256 (match system ("x86_64-linux" (base32 - "1k374q9v1bph8605sirzmaxnawbddahpgq8d99x1527gj5n2xws1")) + "1x1p7han5crnbw906iwdifykr6grzm0w27dy9gz75j0q1b32i4px")) ("i686-linux" (base32 - "040jkqkh0qyva5z6gy4d95khhhvsw4vp8x3l818gpi6hfknwb9l8")))))))))) + "06wqs0xxnpw3hn0xjb4c9cs0899p1xwkcysa2rvzhvpra0c5vsg2")))))))))) (synopsis "Bootstrap binaries of the GNU Compiler Collection") (description #f) (home-page #f))) -- cgit v1.2.3