[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
52/58: gnu: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash.
From: |
guix-commits |
Subject: |
52/58: gnu: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash. |
Date: |
Thu, 6 Feb 2020 17:52:26 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit bb5f72a5385117c901ccae201c4c055874ddb0ea
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Fri Nov 22 23:05:15 2019 +0100
gnu: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash.
* gnu/packages/bootstrap.scm (%bootstrap-inputs)[i686-linux,x86-linux]:
Remove
%bootstrap-coreutils&co, %bootstrap-bash.
---
gnu/packages/bootstrap.scm | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index c097d93..0fbe8ef 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -809,19 +809,18 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
(define (%bootstrap-inputs)
;; The initial, pre-built inputs. From now on, we can start building our
;; own packages.
- `(,@(match (%current-system)
- ((or "i686-linux" "x86_64-linux")
- `(("linux-libre-headers" ,%bootstrap-linux-libre-headers)
- ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools)
- ("mes" ,%bootstrap-mes)))
- (_
- `(("libc" ,%bootstrap-glibc)
- ("gcc" ,%bootstrap-gcc)
- ("binutils" ,%bootstrap-binutils))))
- ("coreutils&co" ,%bootstrap-coreutils&co)
-
- ;; In gnu-build-system.scm, we rely on the availability of Bash.
- ("bash" ,%bootstrap-coreutils&co)))
+ (match (%current-system)
+ ((or "i686-linux" "x86_64-linux")
+ `(("linux-libre-headers" ,%bootstrap-linux-libre-headers)
+ ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools)
+ ("mes" ,%bootstrap-mes)))
+ (_
+ `(("libc" ,%bootstrap-glibc)
+ ("gcc" ,%bootstrap-gcc)
+ ("binutils" ,%bootstrap-binutils)
+ ("coreutils&co" ,%bootstrap-coreutils&co)
+ ;; In gnu-build-system.scm, we rely on the availability of Bash.
+ ("bash" ,%bootstrap-coreutils&co)))))
(define %bootstrap-inputs-for-tests
;; These are bootstrap inputs that are cheap to produce (no compilation
- 43/58: gnu: commencement: %bootstrap-inputs+toolchain: Use Gash instead of coreutils&co., (continued)
- 43/58: gnu: commencement: %bootstrap-inputs+toolchain: Use Gash instead of coreutils&co., guix-commits, 2020/02/06
- 42/58: gnu: commencement: Remove m4-mesboot., guix-commits, 2020/02/06
- 55/58: gnu: commencement: gash-core-utils-boot: Update to 0.0.214-fc1b., guix-commits, 2020/02/06
- 50/58: gnu: commencement: coreutils-final: Inherit from coreutils-minimal., guix-commits, 2020/02/06
- 48/58: gnu: commencement: Add tar-boot0., guix-commits, 2020/02/06
- 46/58: gnu: commencement: Add patch-boot0., guix-commits, 2020/02/06
- 54/58: gnu: commencement: gnu-make-mesboot: Rename from make-mesboot., guix-commits, 2020/02/06
- 45/58: gnu: commencement: Add sed-boot0., guix-commits, 2020/02/06
- 47/58: gnu: commencement: Add bzip2-boot0., guix-commits, 2020/02/06
- 58/58: gnu: commencement: glibc-boot0: Remove gash, use bash-mesboot0 only., guix-commits, 2020/02/06
- 52/58: gnu: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash.,
guix-commits <=
- 56/58: gnu: commencement: glibc-mesboot: Use gash only, instead of bash/gash mix., guix-commits, 2020/02/06