GNU bug report logs - #31729
[PATCH] gnu: debootstrap: Substitute chroot in 'patch-source' phase.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Kei Kebreau <kkebreau <at> posteo.net>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#31729: closed ([PATCH] gnu: debootstrap: Substitute chroot in
 'patch-source' phase.)
Date: Fri, 08 Jun 2018 15:11:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Fri, 08 Jun 2018 11:09:05 -0400
with message-id <8736xxgvse.fsf <at> posteo.net>
and subject line Re: [bug#31729] [PATCH] gnu: debootstrap: Substitute chroot in 'patch-source' phase.
has caused the debbugs.gnu.org bug report #31729,
regarding [PATCH] gnu: debootstrap: Substitute chroot in 'patch-source' phase.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
31729: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=31729
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Kei Kebreau <kkebreau <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Kei Kebreau <kkebreau <at> posteo.net>
Subject: [PATCH] gnu: debootstrap: Substitute chroot in 'patch-source' phase.
Date: Tue,  5 Jun 2018 16:20:24 -0400

* gnu/packages/debian.scm (debootstrap)[arguments]: In 'patch-source' phase,
substitute chroot in the debootstrap script file.
---
 gnu/packages/debian.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index 01df30c55..5df575255 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -129,6 +129,7 @@ contains the archive keys used for that.")
          (add-after 'unpack 'patch-source
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((out    (assoc-ref outputs "out"))
+                   (coreutils (assoc-ref inputs "coreutils"))
                    (wget   (assoc-ref inputs "wget"))
                    (debian (assoc-ref inputs "debian-keyring"))
                    (ubuntu (assoc-ref inputs "ubuntu-keyring")))
@@ -141,6 +142,7 @@ contains the archive keys used for that.")
                (substitute* "scripts/gutsy"
                  (("/usr") ubuntu))
                (substitute* "debootstrap"
+                 (("chroot ") (string-append coreutils "/bin/chroot "))
                  (("=/usr") (string-append "=" out)))
                (substitute* "functions"
                  (("wget ") (string-append wget "/bin/wget ")))
@@ -154,7 +156,8 @@ contains the archive keys used for that.")
        #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")))
        #:tests? #f)) ; no tests
     (inputs
-     `(("debian-keyring" ,debian-archive-keyring)
+     `(("coreutils" ,coreutils)
+       ("debian-keyring" ,debian-archive-keyring)
        ("ubuntu-keyring" ,ubuntu-keyring)
        ("wget" ,wget)))
     ;; The following are required for debootstrap to work correctly
-- 
2.17.1

[Message part 3 (message/rfc822, inline)]

From: Kei Kebreau <kkebreau <at> posteo.net>
To: ludo <at> gnu.org (Ludovic Courtès)
Cc: 31729-done <at> debbugs.gnu.org
Subject: Re: [bug#31729] [PATCH] gnu: debootstrap: Substitute chroot in
 'patch-source' phase.
Date: Fri, 08 Jun 2018 11:09:05 -0400

[Message part 4 (text/plain, inline)]

ludo <at> gnu.org (Ludovic Courtès) writes:

> Hello Kei,
>
> Kei Kebreau <kkebreau <at> posteo.net> skribis:
>
>> * gnu/packages/debian.scm (debootstrap)[arguments]: In 'patch-source' phase,
>> substitute chroot in the debootstrap script file.
>
> Please add “[inputs]: Add COREUTILS.” as well.  Otherwise LGTM!
>
> Thanks,
> Ludo’.

Thanks for reviewing! Pushed to master with the suggested change.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.