Browse Source

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.
wip-gnome3.34
Ludovic Courtès 3 years ago
parent
commit
92d00ca466
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
  1. 1
      .gitignore
  2. 2
      Makefile.am
  3. 35
      gnu/local.mk
  4. BIN
      gnu/packages/bootstrap/aarch64-linux/bash
  5. BIN
      gnu/packages/bootstrap/aarch64-linux/mkdir
  6. BIN
      gnu/packages/bootstrap/aarch64-linux/tar
  7. BIN
      gnu/packages/bootstrap/aarch64-linux/xz
  8. BIN
      gnu/packages/bootstrap/armhf-linux/bash
  9. BIN
      gnu/packages/bootstrap/armhf-linux/mkdir
  10. BIN
      gnu/packages/bootstrap/armhf-linux/tar
  11. BIN
      gnu/packages/bootstrap/armhf-linux/xz
  12. BIN
      gnu/packages/bootstrap/i686-linux/bash
  13. BIN
      gnu/packages/bootstrap/i686-linux/mkdir
  14. BIN
      gnu/packages/bootstrap/i686-linux/tar
  15. BIN
      gnu/packages/bootstrap/i686-linux/xz
  16. BIN
      gnu/packages/bootstrap/mips64el-linux/bash
  17. BIN
      gnu/packages/bootstrap/mips64el-linux/mkdir
  18. BIN
      gnu/packages/bootstrap/mips64el-linux/tar
  19. BIN
      gnu/packages/bootstrap/mips64el-linux/xz
  20. 8
      tests/search-paths.scm

1
.gitignore

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

2
Makefile.am

@ -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

@ -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}

BIN
gnu/packages/bootstrap/aarch64-linux/bash

BIN
gnu/packages/bootstrap/aarch64-linux/mkdir

BIN
gnu/packages/bootstrap/aarch64-linux/tar

BIN
gnu/packages/bootstrap/aarch64-linux/xz

BIN
gnu/packages/bootstrap/armhf-linux/bash

BIN
gnu/packages/bootstrap/armhf-linux/mkdir

BIN
gnu/packages/bootstrap/armhf-linux/tar

BIN
gnu/packages/bootstrap/armhf-linux/xz

BIN
gnu/packages/bootstrap/i686-linux/bash

BIN
gnu/packages/bootstrap/i686-linux/mkdir

BIN
gnu/packages/bootstrap/i686-linux/tar

BIN
gnu/packages/bootstrap/i686-linux/xz

BIN
gnu/packages/bootstrap/mips64el-linux/bash

BIN
gnu/packages/bootstrap/mips64el-linux/mkdir

BIN
gnu/packages/bootstrap/mips64el-linux/tar

BIN
gnu/packages/bootstrap/mips64el-linux/xz

8
tests/search-paths.scm

@ -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…
Cancel
Save