Subject: bug#41541: merge wip-hurd-vm

From: Jan Nieuwenhuizen <[email-masked]>
Date: Fri, 05 Jun 2020 18:24:37 +0200

Ludovic Courtès writes:

> Jan Nieuwenhuizen <[email-masked]> skribis:
>
>> So, after digesting your message here I took the next step: grep for
>> _HURD_STARTUP and change it there, like so
>>
>> diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
>> index 421783eb80..8c73ea8430 100644
>> --- a/gnu/packages/hurd.scm
>> +++ b/gnu/packages/hurd.scm
>> @@ -428,9 +428,10 @@ exec ${system}/rc \"$@\"
>>                                "startup/startup.c")
>>                   (("/hurd/")
>>                    (string-append out "/hurd/")))
>> -               (substitute* "hurd/paths.h"
>> -                 (("_HURD_STARTUP\t")
>> -                  (string-append "_HURD_STARTUP\t\"" out "\" ")))
>> +               (substitute* '("libdiskfs/boot-start.c"
>> +                              "libdiskfs/opts-std-startup.c")
>> +                 (("_HURD_STARTUP")
>> +                  (string-append "\"" out "/hurd/startup\"")))
>
> Perfect!  Perhaps we can add a comment explaining that this is needed
> for the first boot, when the /hurd symlink doesn’t exist yet.

That's a good idea.  I've added a squash commit with

               ;; Upon first boot the /hurd symlink does not exist; it is
               ;; created during activation: Hard-code the .../hurd store file
               ;; name.

>> This also works, and so I figure we're fine now.  I'm resetting
>> wip-hurd-vm and, like Mathieu suggested will prepare to send send a
>> patch series here for the unreviewed subset of patches.
>
> Thank you!

In other news, I've been playing with at "devel-hurd.tmpl" system and
just succeeded to build gnu-make-boot0!  I still need sort of a hack to
include %bootstrap-gcc etc, but this gives me good hopes that we'll be
able create a functional VM to build substitutes after merging!

Greetings,
Janneke

-- 
Jan Nieuwenhuizen <[email-masked]> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com