01/02: Revert "system: hurd: Add "gnu-perl.scm" fixup script."

[guix-commits]

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit c77cf45710f991a9011aa8a28afdc4e474d90b8c
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun Apr 19 11:11:47 2020 +0200

    Revert "system: hurd: Add "gnu-perl.scm" fixup script."
    
    Drop altogether, we now have autoconf and automake cross-built!
    
    This reverts commit a8aff355e5b0c76bbb8fa4485721e84e55893745.
---
 gnu/system/hurd.scm | 69 +++--------------------------------------------------
 1 file changed, 3 insertions(+), 66 deletions(-)

diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 0c2d703..b730d49 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -135,8 +135,7 @@
       (append-map input->packages
                   (fold alist-delete (package-direct-inputs guix)
                         '("graphviz" "po4a")))
-      (list gawk diffutils gnu-make m4 tar xz
-            bootstrap-gcc bootstrap-binutils bootstrap-glibc)
+      (list gawk diffutils gnu-make m4 tar xz)
       %base-packages/hurd))))
 
 (define operating-system-accounts
@@ -318,63 +317,6 @@ sshd:x:2:2:sshd:/var/empty:/bin/no-sh
     (with-parameters ((%current-target-system "i586-pc-gnu"))
       (operating-system-activation-script os)))
 
-  (define root-.gitconfig
-    (plain-file "root-.gitconfig"
-                "\
-[url \"git+ssh://git.sv.gnu.org/srv/git/\"]
-       insteadof = gnu:
-[url \"git://git.savannah.gnu.org/\"]
-       insteadof = gnu-anon:\n"))
-
-  (define root-bin-gnu-perl.scm
-    (plain-file "root-bin-gnu-perl.scm"
-                "\
-#! /run/current-system/profile/bin/guile \
---no-auto-compile
-!#
-
-;; The perl cross-build is faked, which has cross-built autoconf,
-;; automake and texinfo use the build's perl instead of the host.
-
-(use-modules (guix build utils)
-             (guix packages)
-             (guix store))
-
-(let* ((store (open-connection))
-       (bash (run-with-store store
-                     (package-file (@@ (gnu packages bootstrap) 
%bootstrap-coreutils&co))))
-       (m4 (run-with-store store
-                     (package-file (@@ (gnu packages commencement) m4-boot0))))
-       (perl (run-with-store store
-               (package-file (@@ (gnu packages commencement) perl-boot0))))
-       (bin \"/root/bin\"))
-  (mkdir-p bin)
-  (map
-   (lambda (name)
-     (let ((old (string-append \"/run/current-system/profile/bin/\" name))
-           (new (string-append bin \"/\" name)))
-       (copy-file old new)
-       (substitute* new
-         ((\"/gnu/store/[^/]*-bash-[^/]*\") bash)
-         ((\"/gnu/store/[^/]*-m4-[^/]*\") m4)
-         ((\"/gnu/store/[^/]*-perl-5[^/]*\") perl))))
-   '(\"aclocal\"
-     \"autoconf\"
-     \"autoheader\"
-     \"autom4te\"
-     \"automake\"
-     \"autopoint\"
-     \"autoreconf\"
-     \"autoscan\"
-     \"autoupdate\"
-     \"ifnames\"
-     \"makeinfo\")))
-
-(format #t \"Scripts fixed; use
-PATH=/root/bin:$PATH
-export AUTOM4TE=/root/bin/autom4te
-export AUTOHEADER=/root/bin/autoheader\n\")\n"))
-
   (define hurd-directives
     `((directory "/servers")
       ,@(map (lambda (server)
@@ -433,10 +375,7 @@ export AUTOHEADER=/root/bin/autoheader\n\")\n"))
       ("/bin/sh" -> ,(file-append (with-parameters ((%current-target-system
                                                      "i586-pc-gnu"))
                                     bash)
-                                  "/bin/sh"))
-      ("/root/.gitconfig" -> ,root-.gitconfig)
-      (directory "/root/bin")
-      ("/root/bin/gnu-perl.scm" -> ,root-bin-gnu-perl.scm)))
+                                  "/bin/sh"))))
 
   (qemu-image #:file-system-type "ext2"
               #:file-system-options '("-o" "hurd")
@@ -448,9 +387,7 @@ export AUTOHEADER=/root/bin/autoheader\n\")\n"))
                          ("group" ,group)
                          ("shadow" ,shadow)
                          ("shepherd.conf" ,shepherd.conf)
-                         ("boot-activation" ,boot-activation)
-                         ("root-.gitconfig" ,root-.gitconfig)
-                         ("root-bin-gnu-perl.scm" ,root-bin-gnu-perl.scm))
+                         ("boot-activation" ,boot-activation))
               #:copy-inputs? #t
               #:os system-profile
               #:bootcfg-drv grub.cfg