From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id EEE9AyFy2l4lPQAA0tVLHw (envelope-from ) for ; Fri, 05 Jun 2020 16:26:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id SF6wOiBy2l4WNwAAbx9fmQ (envelope-from ) for ; Fri, 05 Jun 2020 16:26:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 11CF9940308 for ; Fri, 5 Jun 2020 16:26:08 +0000 (UTC) Received: from localhost ([::1]:40354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhFAV-0000EV-2J for larch@yhetil.org; Fri, 05 Jun 2020 12:26:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhF9S-0007Xy-ME for bug-guix@gnu.org; Fri, 05 Jun 2020 12:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38163) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhF9S-0004Ju-CM for bug-guix@gnu.org; Fri, 05 Jun 2020 12:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jhF9S-0001md-8L for bug-guix@gnu.org; Fri, 05 Jun 2020 12:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#41541: merge wip-hurd-vm Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 05 Jun 2020 16:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41541 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 41541-submit@debbugs.gnu.org id=B41541.15913742906834 (code B ref 41541); Fri, 05 Jun 2020 16:25:02 +0000 Received: (at 41541) by debbugs.gnu.org; 5 Jun 2020 16:24:50 +0000 Received: from localhost ([127.0.0.1]:49709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhF9F-0001m9-Kk for submit@debbugs.gnu.org; Fri, 05 Jun 2020 12:24:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhF9D-0001lv-Av for 41541@debbugs.gnu.org; Fri, 05 Jun 2020 12:24:48 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40796) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhF97-0004CN-8G; Fri, 05 Jun 2020 12:24:41 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=48308 helo=dundal.peder.onsbrabantnet.nl) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jhF96-0007pv-Ft; Fri, 05 Jun 2020 12:24:40 -0400 From: Jan Nieuwenhuizen Organization: AvatarAcademy.nl References: <87o8qavktf.fsf@gnu.org> <87tv01vgqy.fsf@gnu.org> <87blm54hae.fsf@gnu.org> <874krtyhtg.fsf@gnu.org> <87h7vtzupa.fsf@gnu.org> <87r1uxwz5q.fsf@gnu.org> <87mu5ly7tx.fsf@gnu.org> <87mu5lsksn.fsf@gnu.org> <87y2p5vb7v.fsf@gnu.org> <87wo4oqzgu.fsf@gnu.org> <87k10otbr1.fsf@gnu.org> <87v9k85fdc.fsf@gnu.org> <874krrrj3c.fsf@gnu.org> <87mu5jfa75.fsf@gnu.org> <87mu5jhxp8.fsf@gnu.org> <878sh14hsv.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Fri, 05 Jun 2020 18:24:37 +0200 In-Reply-To: <878sh14hsv.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Fri, 05 Jun 2020 18:08:00 +0200") Message-ID: <87a71ha3ay.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 41541@debbugs.gnu.org, Mathieu Othacehe Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: nHmp+pcfgirc Ludovic Court=C3=A8s writes: > Jan Nieuwenhuizen 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=E2=80=99t 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 f= ile ;; 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 --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com