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

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

[Kei Kebreau]

* 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

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

[Ludovic Courtès]

Hello Kei,

Kei Kebreau <kkebreau@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’.

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

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 413 bytes --]

ludo@gnu.org (Ludovic Courtès) writes:

> Hello Kei,
>
> Kei Kebreau <kkebreau@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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]