build: Remove 'gnu/packages/bootstrap' and its binaries.

* gnu/local.mk (bootstrapdir, bootstrap_i686_linuxdir)
(bootstrap_armhf_linuxdir, bootstrap_aarch64_linuxdir)
(bootstrap_mips64el_linuxdir, dist_bootstrap_i686_linux_DATA)
(dist_bootstrap_armhf_linux_DATA, dist_bootstrap_aarch64_linux_DATA)
(dist_bootstrap_mips64el_linux_DATA): Remove.
(set-bootstrap-executable-permissions): Remove target.
* Makefile.am (install-data-hook): Remove dependency on
'set-bootstrap-executable-permissions'.
* gnu/packages/bootstrap: Remove directory.
* tests/search-paths.scm ("evaluate-search-paths, separator is #f"):
Adjust to match .../aux-files/linux-libre.
This commit is contained in:
Ludovic Courtès 2019-06-14 21:53:25 +02:00
parent 1ba0b1e6ec
commit 92d00ca466
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
20 changed files with 6 additions and 40 deletions

1
.gitignore vendored
View file

@ -149,3 +149,4 @@ tmp
/etc/indent-code.el /etc/indent-code.el
/.version /.version
/doc/stamp-[0-9] /doc/stamp-[0-9]
/gnu/packages/bootstrap

View file

@ -589,7 +589,7 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA
# The above trick doesn't work for 'config.go' because both 'config.scm' and # The above trick doesn't work for 'config.go' because both 'config.scm' and
# 'config.go' are listed in $(nobase_nodist_guileobject_DATA). Thus, give it # 'config.go' are listed in $(nobase_nodist_guileobject_DATA). Thus, give it
# special treatment. # special treatment.
install-data-hook: set-bootstrap-executable-permissions install-data-hook:
touch "$(DESTDIR)$(guileobjectdir)/guix/config.go" touch "$(DESTDIR)$(guileobjectdir)/guix/config.go"
# Assuming Guix is already installed and the daemon is up and running, this # Assuming Guix is already installed and the daemon is up and running, this

View file

@ -1385,38 +1385,3 @@ dist_patch_DATA = \
MISC_DISTRO_FILES = \ MISC_DISTRO_FILES = \
%D%/packages/ld-wrapper.in %D%/packages/ld-wrapper.in
bootstrapdir = $(guilemoduledir)/%D%/packages/bootstrap
bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
bootstrap_armhf_linuxdir = $(bootstrapdir)/armhf-linux
bootstrap_aarch64_linuxdir = $(bootstrapdir)/aarch64-linux
bootstrap_mips64el_linuxdir = $(bootstrapdir)/mips64el-linux
dist_bootstrap_i686_linux_DATA = \
%D%/packages/bootstrap/i686-linux/bash \
%D%/packages/bootstrap/i686-linux/mkdir \
%D%/packages/bootstrap/i686-linux/tar \
%D%/packages/bootstrap/i686-linux/xz
dist_bootstrap_armhf_linux_DATA = \
%D%/packages/bootstrap/armhf-linux/bash \
%D%/packages/bootstrap/armhf-linux/mkdir \
%D%/packages/bootstrap/armhf-linux/tar \
%D%/packages/bootstrap/armhf-linux/xz
dist_bootstrap_aarch64_linux_DATA = \
%D%/packages/bootstrap/aarch64-linux/bash \
%D%/packages/bootstrap/aarch64-linux/mkdir \
%D%/packages/bootstrap/aarch64-linux/tar \
%D%/packages/bootstrap/aarch64-linux/xz
dist_bootstrap_mips64el_linux_DATA = \
%D%/packages/bootstrap/mips64el-linux/bash \
%D%/packages/bootstrap/mips64el-linux/mkdir \
%D%/packages/bootstrap/mips64el-linux/tar \
%D%/packages/bootstrap/mips64el-linux/xz
# Those files must remain executable, so they remain executable once
# imported into the store.
set-bootstrap-executable-permissions:
chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}

Binary file not shown.

View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2019 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -29,17 +29,17 @@ (define %top-srcdir
(test-equal "evaluate-search-paths, separator is #f" (test-equal "evaluate-search-paths, separator is #f"
(string-append %top-srcdir (string-append %top-srcdir
"/gnu/packages/bootstrap/aarch64-linux") "/gnu/packages/aux-files/linux-libre")
;; The following search path spec should evaluate to a single item: the ;; The following search path spec should evaluate to a single item: the
;; first directory that matches the "-linux$" pattern in ;; first directory that matches the "-linux$" pattern in
;; gnu/packages/bootstrap. ;; gnu/packages/bootstrap.
(let ((spec (search-path-specification (let ((spec (search-path-specification
(variable "CHBOUIB") (variable "CHBOUIB")
(files '("gnu/packages/bootstrap")) (files '("gnu/packages/aux-files"))
(file-type 'directory) (file-type 'directory)
(separator #f) (separator #f)
(file-pattern "-linux$")))) (file-pattern "^linux"))))
(match (evaluate-search-paths (list spec) (match (evaluate-search-paths (list spec)
(list %top-srcdir)) (list %top-srcdir))
(((spec* . value)) (((spec* . value))