[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] gnu: %static-inputs: Use bash from PATH in bootstrap tar.
From: |
Carlos Sánchez de La Lama |
Subject: |
Re: [PATCH] gnu: %static-inputs: Use bash from PATH in bootstrap tar. |
Date: |
Mon, 24 Oct 2016 08:59:52 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) |
Hi!
>> See
>> <http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>.
>
> Could you put this URL next to the “Do not use /bin/sh” comment?
>
>> gnu/packages/make-bootstrap.scm (%static-inputs): Use bash from PATH.
>
> Otherwise LGTM, thanks!
Done, and untabify'ed also (I forgot on first version).
Thanks!
Carlos
gnu: %static-inputs: Use bash from PATH in bootstrap tar.
gnu/packages/make-bootstrap.scm (%static-inputs): Use bash from PATH.
---
gnu/packages/make-bootstrap.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index def9c23..28b1549 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -186,6 +186,17 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(inputs (if (%current-target-system)
`(("bash" ,%bash-static))
'()))))
+ (tar (package (inherit tar)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (add-before 'build 'set-shell-file-name
+ (lambda _
+ ;; Do not use "/bin/sh" to run programs. See
+ ;;
<http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>.
+ (substitute* "src/system.c"
+ (("/bin/sh") "sh")
+ (("execv ") "execvp "))
+ #t)))))))
(finalize (compose static-package
package-with-relocatable-glibc)))
`(,@(map (match-lambda
--
2.9.2