diff options
| -rw-r--r-- | distro/packages/base.scm | 14 | ||||
| -rwxr-xr-x | distro/packages/bootstrap/x86_64-linux/bash | bin | 1419928 -> 1419928 bytes | |||
| -rwxr-xr-x | distro/packages/bootstrap/x86_64-linux/mkdir | bin | 799312 -> 799312 bytes | |||
| -rwxr-xr-x | distro/packages/bootstrap/x86_64-linux/tar | bin | 1229888 -> 1229888 bytes | |||
| -rwxr-xr-x | distro/packages/bootstrap/x86_64-linux/xz | bin | 926000 -> 926000 bytes |
5 files changed, 13 insertions, 1 deletions
diff --git a/distro/packages/base.scm b/distro/packages/base.scm index fc1de80b20..107ca55098 100644 --- a/distro/packages/base.scm +++ b/distro/packages/base.scm @@ -1496,7 +1496,7 @@ check whether everything is alright." system "/static-binaries.tar.xz")) (sha256 (base32 - "0bvhkzahjgf6w5i3db5bjgq8kqm6xdr23lig0s1p8fgdqbfp0bzm")))) + "0azisn8l2b3cvgni9k0ahzsxs5cxrj0hmf38zgpq3k6pggk3zbfm")))) "true" ; the program to test "Bootstrap binaries of Coreutils, Awk, etc.")) @@ -2200,10 +2200,22 @@ store.") (string-append bin "/" name))))) (alist-delete "coreutils" %build-inputs)) + ;; But of course, there are exceptions to this rule. + (let ((grep (assoc-ref %build-inputs "grep"))) + (copy-file (string-append grep "/bin/fgrep") + (string-append bin "/fgrep")) + (copy-file (string-append grep "/bin/egrep") + (string-append bin "/egrep"))) + ;; Clear references to the store path. (for-each remove-store-references (directory-contents bin)) + (with-directory-excursion bin + ;; Programs such as Perl's build system want these aliases. + (symlink "bash" "sh") + (symlink "gawk" "awk")) + #t))))) (description "Statically-linked bootstrap binaries") (long-description diff --git a/distro/packages/bootstrap/x86_64-linux/bash b/distro/packages/bootstrap/x86_64-linux/bash Binary files differindex 81114f79c3..3b0227fbb1 100755 --- a/distro/packages/bootstrap/x86_64-linux/bash +++ b/distro/packages/bootstrap/x86_64-linux/bash diff --git a/distro/packages/bootstrap/x86_64-linux/mkdir b/distro/packages/bootstrap/x86_64-linux/mkdir Binary files differindex 226865dfe6..7207ad8a46 100755 --- a/distro/packages/bootstrap/x86_64-linux/mkdir +++ b/distro/packages/bootstrap/x86_64-linux/mkdir diff --git a/distro/packages/bootstrap/x86_64-linux/tar b/distro/packages/bootstrap/x86_64-linux/tar Binary files differindex c9a2c27d13..9104da7b53 100755 --- a/distro/packages/bootstrap/x86_64-linux/tar +++ b/distro/packages/bootstrap/x86_64-linux/tar diff --git a/distro/packages/bootstrap/x86_64-linux/xz b/distro/packages/bootstrap/x86_64-linux/xz Binary files differindex 02f9014740..488e319b37 100755 --- a/distro/packages/bootstrap/x86_64-linux/xz +++ b/distro/packages/bootstrap/x86_64-linux/xz |