From 92d00ca4661e186022732a47956a2bc0ef16be96 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 14 Jun 2019 21:53:25 +0200 Subject: 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. --- .gitignore | 1 + Makefile.am | 2 +- gnu/local.mk | 35 ---------------------------- gnu/packages/bootstrap/aarch64-linux/bash | Bin 1162056 -> 0 bytes gnu/packages/bootstrap/aarch64-linux/mkdir | Bin 558216 -> 0 bytes gnu/packages/bootstrap/aarch64-linux/tar | Bin 1085128 -> 0 bytes gnu/packages/bootstrap/aarch64-linux/xz | Bin 738576 -> 0 bytes gnu/packages/bootstrap/armhf-linux/bash | Bin 802224 -> 0 bytes gnu/packages/bootstrap/armhf-linux/mkdir | Bin 401544 -> 0 bytes gnu/packages/bootstrap/armhf-linux/tar | Bin 755356 -> 0 bytes gnu/packages/bootstrap/armhf-linux/xz | Bin 502884 -> 0 bytes gnu/packages/bootstrap/i686-linux/bash | Bin 1351732 -> 0 bytes gnu/packages/bootstrap/i686-linux/mkdir | Bin 714316 -> 0 bytes gnu/packages/bootstrap/i686-linux/tar | Bin 1285420 -> 0 bytes gnu/packages/bootstrap/i686-linux/xz | Bin 861836 -> 0 bytes gnu/packages/bootstrap/mips64el-linux/bash | Bin 1409080 -> 0 bytes gnu/packages/bootstrap/mips64el-linux/mkdir | Bin 698500 -> 0 bytes gnu/packages/bootstrap/mips64el-linux/tar | Bin 1283708 -> 0 bytes gnu/packages/bootstrap/mips64el-linux/xz | Bin 851736 -> 0 bytes tests/search-paths.scm | 8 +++---- 20 files changed, 6 insertions(+), 40 deletions(-) delete mode 100755 gnu/packages/bootstrap/aarch64-linux/bash delete mode 100755 gnu/packages/bootstrap/aarch64-linux/mkdir delete mode 100755 gnu/packages/bootstrap/aarch64-linux/tar delete mode 100755 gnu/packages/bootstrap/aarch64-linux/xz delete mode 100755 gnu/packages/bootstrap/armhf-linux/bash delete mode 100755 gnu/packages/bootstrap/armhf-linux/mkdir delete mode 100755 gnu/packages/bootstrap/armhf-linux/tar delete mode 100755 gnu/packages/bootstrap/armhf-linux/xz delete mode 100755 gnu/packages/bootstrap/i686-linux/bash delete mode 100755 gnu/packages/bootstrap/i686-linux/mkdir delete mode 100755 gnu/packages/bootstrap/i686-linux/tar delete mode 100755 gnu/packages/bootstrap/i686-linux/xz delete mode 100755 gnu/packages/bootstrap/mips64el-linux/bash delete mode 100755 gnu/packages/bootstrap/mips64el-linux/mkdir delete mode 100755 gnu/packages/bootstrap/mips64el-linux/tar delete mode 100755 gnu/packages/bootstrap/mips64el-linux/xz diff --git a/.gitignore b/.gitignore index 93d2ec9801..aa374b54b9 100644 --- a/.gitignore +++ b/.gitignore @@ -149,3 +149,4 @@ tmp /etc/indent-code.el /.version /doc/stamp-[0-9] +/gnu/packages/bootstrap diff --git a/Makefile.am b/Makefile.am index 80be73e4bf..ec1e0285ea 100644 --- a/Makefile.am +++ b/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 diff --git a/gnu/local.mk b/gnu/local.mk index b92f82e7cb..0ba0d1f194 100644 --- a/gnu/local.mk +++ b/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} diff --git a/gnu/packages/bootstrap/aarch64-linux/bash b/gnu/packages/bootstrap/aarch64-linux/bash deleted file mode 100755 index 0bfb9d1824..0000000000 Binary files a/gnu/packages/bootstrap/aarch64-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/aarch64-linux/mkdir b/gnu/packages/bootstrap/aarch64-linux/mkdir deleted file mode 100755 index 35cd1815fd..0000000000 Binary files a/gnu/packages/bootstrap/aarch64-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/aarch64-linux/tar b/gnu/packages/bootstrap/aarch64-linux/tar deleted file mode 100755 index 7e68edb0be..0000000000 Binary files a/gnu/packages/bootstrap/aarch64-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/aarch64-linux/xz b/gnu/packages/bootstrap/aarch64-linux/xz deleted file mode 100755 index 5aa18c9234..0000000000 Binary files a/gnu/packages/bootstrap/aarch64-linux/xz and /dev/null differ diff --git a/gnu/packages/bootstrap/armhf-linux/bash b/gnu/packages/bootstrap/armhf-linux/bash deleted file mode 100755 index 212a22c8ce..0000000000 Binary files a/gnu/packages/bootstrap/armhf-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/armhf-linux/mkdir b/gnu/packages/bootstrap/armhf-linux/mkdir deleted file mode 100755 index c3e5246e92..0000000000 Binary files a/gnu/packages/bootstrap/armhf-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/armhf-linux/tar b/gnu/packages/bootstrap/armhf-linux/tar deleted file mode 100755 index 5a6aac8a58..0000000000 Binary files a/gnu/packages/bootstrap/armhf-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/armhf-linux/xz b/gnu/packages/bootstrap/armhf-linux/xz deleted file mode 100755 index a77aebc268..0000000000 Binary files a/gnu/packages/bootstrap/armhf-linux/xz and /dev/null differ diff --git a/gnu/packages/bootstrap/i686-linux/bash b/gnu/packages/bootstrap/i686-linux/bash deleted file mode 100755 index 4b99d7eb4a..0000000000 Binary files a/gnu/packages/bootstrap/i686-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/i686-linux/mkdir b/gnu/packages/bootstrap/i686-linux/mkdir deleted file mode 100755 index 6623a38404..0000000000 Binary files a/gnu/packages/bootstrap/i686-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/i686-linux/tar b/gnu/packages/bootstrap/i686-linux/tar deleted file mode 100755 index d33cd391f1..0000000000 Binary files a/gnu/packages/bootstrap/i686-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/i686-linux/xz b/gnu/packages/bootstrap/i686-linux/xz deleted file mode 100755 index f94dbde77c..0000000000 Binary files a/gnu/packages/bootstrap/i686-linux/xz and /dev/null differ diff --git a/gnu/packages/bootstrap/mips64el-linux/bash b/gnu/packages/bootstrap/mips64el-linux/bash deleted file mode 100755 index 403671d2fa..0000000000 Binary files a/gnu/packages/bootstrap/mips64el-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/mips64el-linux/mkdir b/gnu/packages/bootstrap/mips64el-linux/mkdir deleted file mode 100755 index c8d3285b38..0000000000 Binary files a/gnu/packages/bootstrap/mips64el-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/mips64el-linux/tar b/gnu/packages/bootstrap/mips64el-linux/tar deleted file mode 100755 index 0cdf7cce2c..0000000000 Binary files a/gnu/packages/bootstrap/mips64el-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/mips64el-linux/xz b/gnu/packages/bootstrap/mips64el-linux/xz deleted file mode 100755 index b0622ba946..0000000000 Binary files a/gnu/packages/bootstrap/mips64el-linux/xz and /dev/null differ diff --git a/tests/search-paths.scm b/tests/search-paths.scm index 8dad424415..767a80b76c 100644 --- a/tests/search-paths.scm +++ b/tests/search-paths.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2017, 2019 Ludovic Courtès ;;; ;;; 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)) -- cgit 1.4.1