From: csanchezdll@gmail.com (Carlos Sánchez de La Lama)
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] gnu: %static-inputs: Use bash from PATH in bootstrap tar.
Date: Mon, 24 Oct 2016 08:59:52 +0200 [thread overview]
Message-ID: <7td1iqut93.fsf@gmail.com> (raw)
In-Reply-To: <871szc73pi.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Wed, 19 Oct 2016 17:34:17 +0200")
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
next prev parent reply other threads:[~2016-10-24 7:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-18 15:55 [PATCH] gnu: %static-inputs: Use bash from PATH in bootstrap tar Carlos Sánchez de La Lama
2016-10-19 15:34 ` Ludovic Courtès
2016-10-19 17:13 ` Efraim Flashner
2016-10-19 19:48 ` Ludovic Courtès
2016-10-19 20:00 ` Efraim Flashner
2016-10-24 6:59 ` Carlos Sánchez de La Lama [this message]
2016-10-24 21:08 ` Ludovic Courtès
2016-10-25 7:33 ` Carlos Sánchez de La Lama
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7td1iqut93.fsf@gmail.com \
--to=csanchezdll@gmail.com \
--cc=guix-devel@gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.