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:
parent
1ba0b1e6ec
commit
92d00ca466
1
.gitignore
vendored
1
.gitignore
vendored
@ -149,3 +149,4 @@ tmp
|
||||
/etc/indent-code.el
|
||||
/.version
|
||||
/doc/stamp-[0-9]
|
||||
/gnu/packages/bootstrap
|
||||
|
@ -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
|
||||
# 'config.go' are listed in $(nobase_nodist_guileobject_DATA). Thus, give it
|
||||
# special treatment.
|
||||
install-data-hook: set-bootstrap-executable-permissions
|
||||
install-data-hook:
|
||||
touch "$(DESTDIR)$(guileobjectdir)/guix/config.go"
|
||||
|
||||
# Assuming Guix is already installed and the daemon is up and running, this
|
||||
|
35
gnu/local.mk
35
gnu/local.mk
@ -1385,38 +1385,3 @@ dist_patch_DATA = \
|
||||
|
||||
MISC_DISTRO_FILES = \
|
||||
%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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
;;; 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.
|
||||
;;;
|
||||
@ -29,17 +29,17 @@
|
||||
|
||||
(test-equal "evaluate-search-paths, separator is #f"
|
||||
(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
|
||||
;; first directory that matches the "-linux$" pattern in
|
||||
;; gnu/packages/bootstrap.
|
||||
(let ((spec (search-path-specification
|
||||
(variable "CHBOUIB")
|
||||
(files '("gnu/packages/bootstrap"))
|
||||
(files '("gnu/packages/aux-files"))
|
||||
(file-type 'directory)
|
||||
(separator #f)
|
||||
(file-pattern "-linux$"))))
|
||||
(file-pattern "^linux"))))
|
||||
(match (evaluate-search-paths (list spec)
|
||||
(list %top-srcdir))
|
||||
(((spec* . value))
|
||||
|
Loading…
Reference in New Issue
Block a user