From patchwork Wed Apr 29 08:47:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 21744 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 545CD27BBE4; Wed, 29 Apr 2020 09:54:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 2F9B527BBE1 for ; Wed, 29 Apr 2020 09:54:04 +0100 (BST) Received: from localhost ([::1]:41178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiTj-00007N-MK for patchwork@mira.cbaines.net; Wed, 29 Apr 2020 04:54:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57068) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiQC-00072L-Bm for guix-patches@gnu.org; Wed, 29 Apr 2020 04:53:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTiOs-0002t8-Nc for guix-patches@gnu.org; Wed, 29 Apr 2020 04:50:24 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTiOs-0002sz-BR for guix-patches@gnu.org; Wed, 29 Apr 2020 04:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTiOs-0005DG-9L for guix-patches@gnu.org; Wed, 29 Apr 2020 04:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40955] [PATCH 1/5] build: store-copy: Export file-size procedure. References: <20200429083814.23768-1-m.othacehe@gmail.com> In-Reply-To: <20200429083814.23768-1-m.othacehe@gmail.com> Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Apr 2020 08:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40955 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40955@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 40955-submit@debbugs.gnu.org id=B40955.158815009019927 (code B ref 40955); Wed, 29 Apr 2020 08:49:02 +0000 Received: (at 40955) by debbugs.gnu.org; 29 Apr 2020 08:48:10 +0000 Received: from localhost ([127.0.0.1]:42381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTiO1-0005BK-QM for submit@debbugs.gnu.org; Wed, 29 Apr 2020 04:48:09 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:39827) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTiO0-0005Az-Gr for 40955@debbugs.gnu.org; Wed, 29 Apr 2020 04:48:08 -0400 Received: by mail-wm1-f51.google.com with SMTP id y24so1082976wma.4 for <40955@debbugs.gnu.org>; Wed, 29 Apr 2020 01:48:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9JF/rrWuq1GAMvDqwOj695LzKi+6EpN89GlQU5jccI0=; b=ojZL5uDfcgIB/54Rl5lpmxHgl0Vdio8Nj3WbOg3Xh5kJgoENbVQmVC44JryR/HkmU5 ftKX7+56yCHJClSoh6UQSelSUCO5/GvZEwWnjNX8J3sjDrHnUyVXpQvRIC7CxHtZLBtZ Xmq0jZ1+x4SFABKwW65lgQ41czGhLHk6VCj0ffT3MX9X9nJbcmaRUQfapKzkDQ8Msp9f 2Ey58ZCrq33cN9UUPNsFgkNvmLwFwCngZiJRYmmEKN6YvAcpYcLHIAbH37aykvnm3Q7K hOWaC2yRcsDStLmeV8psf6DGt+Z2YeFE8MKVGmlG/XPy5HjB9dY3AG3wWiPqV6zgSA30 TczQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9JF/rrWuq1GAMvDqwOj695LzKi+6EpN89GlQU5jccI0=; b=ZQ57U8UXvs+g0p3AY0t65vCmuhteqJvaztWIxnc5D0xsGBt962NyXIOyAsET9ALmbG QNSq3joq6gDQ3mbGIrM6TkHG3BmQr7OUbI8eR0nVMOhy9TAqAEdcAv0cwmgKUyKYwxmP c0q5sq/Ivs6QjX2w3QUVT9/TeNdqeKXvCMl8Gz6ah+mhUuODyAeNxXClG5SCsKQyzdWx MWs3gEQnlwwTBddcB3+ESx0lzBr3nDHQd/EFFowcDGsFcMPEVscgh8NojH+DoBu19RDq bMYLltsv/YKQjQ/10N7C3T2xYoRh8r2InThgteP7ZIv55heNeMyz0WFN5lYPrc2CK3pi YfFA== X-Gm-Message-State: AGi0PuZAhWTvDPJy6/JvFbTagnkiJrxpw2qewEInX/sU0mnYeHZPYCuw LO/9MrHm9fQ7R5niEHtFIjMFlEVV X-Google-Smtp-Source: APiQypIn7FM2CPgkJ3pSymitP/kGxFIv8IsivD0Z/jQ20xw7KKU7dkJMFhiSXAEXGBBIObxVLGmfFA== X-Received: by 2002:a7b:c0c5:: with SMTP id s5mr1982000wmh.134.1588150082422; Wed, 29 Apr 2020 01:48:02 -0700 (PDT) Received: from meru.fronius.com ([2a01:cb18:832e:5f00:e9fd:9d65:b691:fcb3]) by smtp.gmail.com with ESMTPSA id x132sm6812621wmg.33.2020.04.29.01.48.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 01:48:01 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 29 Apr 2020 10:47:52 +0200 Message-Id: <20200429084756.25072-1-m.othacehe@gmail.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/build/store-copy.scm (file-size): Export it. --- guix/build/store-copy.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/build/store-copy.scm b/guix/build/store-copy.scm index 549aa4f28b..ad551bca98 100644 --- a/guix/build/store-copy.scm +++ b/guix/build/store-copy.scm @@ -35,6 +35,7 @@ read-reference-graph + file-size closure-size populate-store)) From patchwork Wed Apr 29 08:47:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 21746 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D385B27BBE4; Wed, 29 Apr 2020 09:54:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id AE34827BBE1 for ; Wed, 29 Apr 2020 09:54:10 +0100 (BST) Received: from localhost ([::1]:41518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiTq-0000HV-8c for patchwork@mira.cbaines.net; Wed, 29 Apr 2020 04:54:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57078) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiQH-00072o-9H for guix-patches@gnu.org; Wed, 29 Apr 2020 04:53:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTiOt-0002tf-3j for guix-patches@gnu.org; Wed, 29 Apr 2020 04:50:29 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59080) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTiOs-0002tK-NQ for guix-patches@gnu.org; Wed, 29 Apr 2020 04:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTiOs-0005DO-Lv for guix-patches@gnu.org; Wed, 29 Apr 2020 04:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40955] [PATCH 2/5] build: install: Ignore chown exceptions. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Apr 2020 08:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40955 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40955@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 40955-submit@debbugs.gnu.org id=B40955.158815009619952 (code B ref 40955); Wed, 29 Apr 2020 08:49:02 +0000 Received: (at 40955) by debbugs.gnu.org; 29 Apr 2020 08:48:16 +0000 Received: from localhost ([127.0.0.1]:42386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTiO6-0005Bb-0a for submit@debbugs.gnu.org; Wed, 29 Apr 2020 04:48:16 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:52359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTiO1-0005B1-B4 for 40955@debbugs.gnu.org; Wed, 29 Apr 2020 04:48:09 -0400 Received: by mail-wm1-f67.google.com with SMTP id 188so1079424wmc.2 for <40955@debbugs.gnu.org>; Wed, 29 Apr 2020 01:48:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N4b8zymqUyhaBguhVjxacR/W4doLh8jxheDJT9oTcz0=; b=szNxxIauY8O+Fnln0blwZLXC4rQWJleeecjdXQU9k/WQMMN2GD1+4ftmJZdC2Hm6wd XXHGpAsL3NEaSOyJBw/Nr8HymLySQ6H0HKjjzC0oV5N9Ktv+6UFGwO5DabPkE87NCVpy 6z2NvcP2N9oDc83s0oQDnIKD7d1h+EirmoJkV1SlrIIdt6jhwkkzFXWXEOpcFWS/IFw3 57FqdvJAZfQo/+15+Q1oGoGK9vjR74+sZ+ghlbCmOPSsvYeqXKTg9o6DIDhFcCqDMH2x 6CV3/wk/IPpD+OLjoEL4WxbrXYHVU/ppIrWWB0ru0PAXwIDWmwoFGIS+Rl17ty2iCo9+ xnVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N4b8zymqUyhaBguhVjxacR/W4doLh8jxheDJT9oTcz0=; b=Hm6+PFzpAa6CYp7f0q8XsTiGvzXpm7HRWXuv9TSgui0SqTb/maHux/LIqYkOxIpvCY o0bV6OHNSBlqCKTdtecrxE2Cb91lWehw4tHnX9peb4XVBGywKrHRsURRvGiwJrjCjN55 ui2R4iLW95oZbBzAlrj3e/4rS95nQqWzWURf6ayake+hhC86VVHLPKgLKFqR1v1j+ib6 l/z/a1vl96cbB8EKxmaJz0Ql2ADb7W+7UwPo7VWUXextOMxWikotIg/eUa94j998rPP8 cZte5A/BsQEr9Im0dSgekZZkWdUZIyWN1UCgwS5fIsxoWiXQSZdoGp0h4N4snWx1xTh6 Kx8A== X-Gm-Message-State: AGi0PuZa/oIYZK65RR+xK8gEcdBrTzxbZ8mDpAjrTsbVtX6TlcyIC1Mx PdXMxj7ytHAgWfTPMKgROAfK6dyy X-Google-Smtp-Source: APiQypKyshEcxKSuQxowqLNbGE56OQU6Hzx5Henwv/xPrK/VQwd8aC7K9qWkJe/2mKIkIrewEjAa4Q== X-Received: by 2002:a05:600c:224a:: with SMTP id a10mr2114031wmm.174.1588150083482; Wed, 29 Apr 2020 01:48:03 -0700 (PDT) Received: from meru.fronius.com ([2a01:cb18:832e:5f00:e9fd:9d65:b691:fcb3]) by smtp.gmail.com with ESMTPSA id x132sm6812621wmg.33.2020.04.29.01.48.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 01:48:02 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 29 Apr 2020 10:47:53 +0200 Message-Id: <20200429084756.25072-2-m.othacehe@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200429084756.25072-1-m.othacehe@gmail.com> References: <20200429084756.25072-1-m.othacehe@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Changing ownership may require root permissions. As image can now be generated without root permissions (no VM involved), ignore those exceptions. * gnu/build/install.scm (evaluate-populate-directive): Ignore chown exceptions. --- gnu/build/install.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/build/install.scm b/gnu/build/install.scm index c0d4d44091..0b0d01cf86 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -63,7 +63,9 @@ directory TARGET." (('directory name uid gid) (let ((dir (string-append target name))) (mkdir-p dir) - (chown dir uid gid))) + ;; This will fail if this is not run from a VM, ignore those + ;; errors. + (false-if-exception (chown dir uid gid)))) (('directory name uid gid mode) (loop `(directory ,name ,uid ,gid)) (chmod (string-append target name) mode)) From patchwork Wed Apr 29 08:47:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 21745 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E062027BBE4; Wed, 29 Apr 2020 09:54:05 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 6A70F27BBE1 for ; Wed, 29 Apr 2020 09:54:05 +0100 (BST) Received: from localhost ([::1]:41206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiTl-00008Z-0O for patchwork@mira.cbaines.net; Wed, 29 Apr 2020 04:54:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57082) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiQI-00072y-JJ for guix-patches@gnu.org; Wed, 29 Apr 2020 04:53:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTiOt-0002vR-Iq for guix-patches@gnu.org; Wed, 29 Apr 2020 04:50:30 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59081) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTiOt-0002tq-46 for guix-patches@gnu.org; Wed, 29 Apr 2020 04:49:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTiOt-0005DV-23 for guix-patches@gnu.org; Wed, 29 Apr 2020 04:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40955] [PATCH 3/5] build: bootloader: Add install-efi procedure. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Apr 2020 08:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40955 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40955@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 40955-submit@debbugs.gnu.org id=B40955.158815009719959 (code B ref 40955); Wed, 29 Apr 2020 08:49:03 +0000 Received: (at 40955) by debbugs.gnu.org; 29 Apr 2020 08:48:17 +0000 Received: from localhost ([127.0.0.1]:42388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTiO8-0005Bl-Iy for submit@debbugs.gnu.org; Wed, 29 Apr 2020 04:48:17 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:56280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTiO2-0005B3-D8 for 40955@debbugs.gnu.org; Wed, 29 Apr 2020 04:48:10 -0400 Received: by mail-wm1-f50.google.com with SMTP id e26so1065446wmk.5 for <40955@debbugs.gnu.org>; Wed, 29 Apr 2020 01:48:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/jGuAwU24E9GEwu4XlrPjIZFzkZZfvlHV2ClD/llzQ0=; b=Y8nAyAWtqlAcrhmrhrHCeCN/wFtGsQH//aW9LcMPTfiKIANMpkhtY61YpxGoafIp5X z/V8CHf0l9zmYPBH8yMzVryXdvMBPvB24cDJZVT3P5zfoWE58GKTH6+4WJl0daQ2fapZ XhiVzOZ5w6oAKNEnzwMpCBi5kcGRzEWk7tmaMk9aSK4TWqqIbh/H2iBGGRZoZquBh1gk nV4GXFQC7aBVwCqDz8cWU/n3RNEgZ8E/0cUIshcx+HAxeNfdXG5DKB6CwPfnDIR1ehRc UTB/XfWi4x+DSzP8DWabpnWyUXJgMBJJxdaVxzwJ5EuLGJC+aUOauPWAOqtFpllyN6Pu YbAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/jGuAwU24E9GEwu4XlrPjIZFzkZZfvlHV2ClD/llzQ0=; b=cShD9Sb21Mp5hDuO+8jX09JNfBhmVz7vNZqvCDIUW9NzrykI0pB1Ol6zbZA55Sh1iZ rhli+WZElGE2fX+yfz7k6ovxjug04xJnWvDGQfNZftEWlZLEFgF2v6coHn974AkaO9d7 uouGx9xMr3+xC3etK59QMBGw8gVN66+zCItDHJY+aNGJCT/ImD93QNN2trK8EMy+Hlle vVCXMPqNc+Bv7dF+r2onXurl10Rpr8rxq9EAcyvUxlw2+AlZjtDYuh7nZUCvNo2w6Wgm AsY/FveI30Z1VI/vV7LJjBpTmKOvToWasVB9/ZxfJqWtgwWhWmbJV/O5hw2sfpXiYOda E+cg== X-Gm-Message-State: AGi0PuaoonjX8BMu23+2f+lphQpbymGQNO7eJnXH0TdWA1AWZt7tHKa3 WAWK/DE2NPhA3gouredTxIX+GLc/ X-Google-Smtp-Source: APiQypLyMIUl2vkjNUJDpomVeZud6OCHE1bxmwTGN0mkRGe6wIhQiyh6H3GGp6CAXSfVa27fkLlNcw== X-Received: by 2002:a1c:f418:: with SMTP id z24mr1986096wma.122.1588150084381; Wed, 29 Apr 2020 01:48:04 -0700 (PDT) Received: from meru.fronius.com ([2a01:cb18:832e:5f00:e9fd:9d65:b691:fcb3]) by smtp.gmail.com with ESMTPSA id x132sm6812621wmg.33.2020.04.29.01.48.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 01:48:03 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 29 Apr 2020 10:47:54 +0200 Message-Id: <20200429084756.25072-3-m.othacehe@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200429084756.25072-1-m.othacehe@gmail.com> References: <20200429084756.25072-1-m.othacehe@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/build/bootloader.scm (install-efi-loader): New exported procedure. This is based on install-efi from (gnu build vm) module. * gnu/build/vm.scm (initialize-hard-disk): Adapt to use install-efi-loader. --- gnu/build/bootloader.scm | 55 +++++++++++++++++++++++++++++++++++++++- gnu/build/vm.scm | 19 +++----------- 2 files changed, 57 insertions(+), 17 deletions(-) diff --git a/gnu/build/bootloader.scm b/gnu/build/bootloader.scm index 9570d6dd18..e15e7c0828 100644 --- a/gnu/build/bootloader.scm +++ b/gnu/build/bootloader.scm @@ -18,8 +18,12 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu build bootloader) + #:use-module (guix build utils) + #:use-module (guix utils) #:use-module (ice-9 binary-ports) - #:export (write-file-on-device)) + #:use-module (ice-9 format) + #:export (write-file-on-device + install-efi-loader)) ;;; @@ -36,3 +40,52 @@ (seek output offset SEEK_SET) (put-bytevector output bv)) #:binary #t))))) + + +;;; +;;; EFI bootloader. +;;; + +(define (install-efi grub grub-config esp) + "Write a self-contained GRUB EFI loader to the mounted ESP using GRUB-CONFIG." + (let* ((system %host-type) + ;; Hard code the output location to a well-known path recognized by + ;; compliant firmware. See "3.5.1.1 Removable Media Boot Behaviour": + ;; http://www.uefi.org/sites/default/files/resources/UEFI%20Spec%202_6.pdf + (grub-mkstandalone (string-append grub "/bin/grub-mkstandalone")) + (efi-directory (string-append esp "/EFI/BOOT")) + ;; Map grub target names to boot file names. + (efi-targets (cond ((string-prefix? "x86_64" system) + '("x86_64-efi" . "BOOTX64.EFI")) + ((string-prefix? "i686" system) + '("i386-efi" . "BOOTIA32.EFI")) + ((string-prefix? "armhf" system) + '("arm-efi" . "BOOTARM.EFI")) + ((string-prefix? "aarch64" system) + '("arm64-efi" . "BOOTAA64.EFI"))))) + ;; grub-mkstandalone requires a TMPDIR to prepare the firmware image. + (setenv "TMPDIR" esp) + + (mkdir-p efi-directory) + (invoke grub-mkstandalone "-O" (car efi-targets) + "-o" (string-append efi-directory "/" + (cdr efi-targets)) + ;; Graft the configuration file onto the image. + (string-append "boot/grub/grub.cfg=" grub-config)))) + +(define (install-efi-loader grub-efi esp) + ;; Create a tiny configuration file telling the embedded grub + ;; where to load the real thing. + ;; XXX This is quite fragile, and can prevent the image from booting + ;; when there's more than one volume with this label present. + ;; Reproducible almost-UUIDs could reduce the risk (not eliminate it). + (let ((grub-config "grub.cfg")) + (call-with-output-file grub-config + (lambda (port) + (format port + "insmod part_msdos~@ + search --set=root --label Guix_image~@ + configfile /boot/grub/grub.cfg~%") + (fsync port))) + (install-efi grub-efi grub-config esp) + (delete-file grub-config))) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 9caa110463..bc6071daa9 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -27,6 +27,7 @@ #:use-module (guix build store-copy) #:use-module (guix build syscalls) #:use-module (guix store database) + #:use-module (gnu build bootloader) #:use-module (gnu build linux-boot) #:use-module (gnu build install) #:use-module (gnu system uuid) @@ -610,30 +611,16 @@ passing it a directory name where it is mounted." (when esp ;; Mount the ESP somewhere and install GRUB UEFI image. - (let ((mount-point (string-append target "/boot/efi")) - (grub-config (string-append target "/tmp/grub-standalone.cfg"))) + (let ((mount-point (string-append target "/boot/efi"))) (display "mounting EFI system partition...\n") (mkdir-p mount-point) (mount (partition-device esp) mount-point (partition-file-system esp)) - ;; Create a tiny configuration file telling the embedded grub - ;; where to load the real thing. - ;; XXX This is quite fragile, and can prevent the image from booting - ;; when there's more than one volume with this label present. - ;; Reproducible almost-UUIDs could reduce the risk (not eliminate it). - (call-with-output-file grub-config - (lambda (port) - (format port - "insmod part_msdos~@ - search --set=root --label Guix_image~@ - configfile /boot/grub/grub.cfg~%"))) - (display "creating EFI firmware image...") - (install-efi grub-efi mount-point grub-config) + (install-efi-loader grub-efi mount-point) (display "done.\n") - (delete-file grub-config) (umount mount-point))) ;; Register BOOTCFG as a GC root. From patchwork Wed Apr 29 08:47:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 21747 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9F14027BBE4; Wed, 29 Apr 2020 09:54:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 0F11127BBE1 for ; Wed, 29 Apr 2020 09:54:13 +0100 (BST) Received: from localhost ([::1]:41666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiTs-0000Kr-Ke for patchwork@mira.cbaines.net; Wed, 29 Apr 2020 04:54:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57090) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiQM-00074w-2R for guix-patches@gnu.org; Wed, 29 Apr 2020 04:54:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTiOu-0002xI-1t for guix-patches@gnu.org; Wed, 29 Apr 2020 04:50:33 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59082) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTiOt-0002vl-Hh for guix-patches@gnu.org; Wed, 29 Apr 2020 04:49:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTiOt-0005Dd-Fo for guix-patches@gnu.org; Wed, 29 Apr 2020 04:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40955] [PATCH 4/5] image: Add a new API. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Apr 2020 08:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40955 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40955@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 40955-submit@debbugs.gnu.org id=B40955.158815010319973 (code B ref 40955); Wed, 29 Apr 2020 08:49:03 +0000 Received: (at 40955) by debbugs.gnu.org; 29 Apr 2020 08:48:23 +0000 Received: from localhost ([127.0.0.1]:42390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTiOD-0005C2-3e for submit@debbugs.gnu.org; Wed, 29 Apr 2020 04:48:23 -0400 Received: from mail-wm1-f47.google.com ([209.85.128.47]:37429) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTiO4-0005B6-Sb for 40955@debbugs.gnu.org; Wed, 29 Apr 2020 04:48:16 -0400 Received: by mail-wm1-f47.google.com with SMTP id z6so1089483wml.2 for <40955@debbugs.gnu.org>; Wed, 29 Apr 2020 01:48:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dipyZLLW1wTU3liMeQlH8wFKNpX7kBXWGNvb1qraBFY=; b=LD4vfQwHjaXFLFH6Ce26VZu/3XIlvvnypihKvbiTN6Xx7KXTFKLEUWTB1Y0QorOWrz pju3xPvOX0/MYvRaK7gx3AVR1C4YQq/ONMa/QtvIrll5J8nEjd6TgNHR+YLms6o+6w8U NJZC1xaZsnSnLmEvDh4qPGEhre7uyJ+P3Q2Q//+ITs5BH8LlXc2DwmB9/kDpENlmwgOw dl2bNkfRhJfGUEvCz1iWqxzOsOPcDff9F6AeNBRCmPCoN1ojla7ncFh1DQ562rxhxK7I Ybxz52sbF6N1KXTWzSsg8IVzrCMJheXRAC1tT2vdlt1hKrEmAwg3MN20sowq0pTVV89m YdGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dipyZLLW1wTU3liMeQlH8wFKNpX7kBXWGNvb1qraBFY=; b=r4C7ngnwacmZ3MK11dHQVVo+TpjDqpknj+ZYlK4P6JVzmlJtkxZpnCXVLqQDPl3wDx A9FkC//K6Kh6EFGMcLOtqY59PFLZn/hMBspIwvd3towdloqHcN2uLqg+JRvAauLrNi2/ eXPgsiHD8CL+QSZgcj949YdpjoMJG8VOLTNLw2OsT7YP/YR9aohk3pe7iX4KA5d5n3Yk Z9MHIbztFFbRS6R7e+oF3+H2Fg5eoCQzSlQjWQQwwsfUAYHhthA5v+VdiCngcSzqGFAg dos1C63BCzb2YpZNebQS/PJvC/ndh4GTDldlVLRj04YCSuMpSgmqN4+ID5IWopLextd/ Gwsw== X-Gm-Message-State: AGi0PuZipVCaAhYPd2/oA69B+0XL3zYvXdTq06AKPG04eZJcF8e3SJmM +xe28zYJ7af4Ocp1h2ZxqAd7U2iz X-Google-Smtp-Source: APiQypLCjCDjgXucHRb++6LrfnazmrA/cIXZnHY2Ov+ZpTfLL0Kjn1BfcFrOjWsBsnq9tPN5OBG0sw== X-Received: by 2002:a1c:f20c:: with SMTP id s12mr2148204wmc.83.1588150085591; Wed, 29 Apr 2020 01:48:05 -0700 (PDT) Received: from meru.fronius.com ([2a01:cb18:832e:5f00:e9fd:9d65:b691:fcb3]) by smtp.gmail.com with ESMTPSA id x132sm6812621wmg.33.2020.04.29.01.48.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 01:48:04 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 29 Apr 2020 10:47:55 +0200 Message-Id: <20200429084756.25072-4-m.othacehe@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200429084756.25072-1-m.othacehe@gmail.com> References: <20200429084756.25072-1-m.othacehe@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Raw disk-images and ISO9660 images are created in a Qemu virtual machine. This is quite fragile, very slow, and almost unusable without KVM. For all these reasons, add support for host image generation. This implies the use new image generation mechanisms. - Raw disk images: images of partitions are created using tools such as mke2fs and mkdosfs depending on the partition file-system type. The partition images are then assembled into a final image using genimage. - ISO9660 images: the ISO root directory is populated within the store. GNU xorriso is then called on that directory, in the exact same way as this is done in (gnu build vm) module. Those mechanisms are built upon the new (gnu image) module. * gnu/image.scm: New file. * gnu/system/image.scm: New file. * gnu/build/image: New file. * gnu/local.mk: Add them. * gnu/system/vm.scm (system-disk-image): Rename to system-disk-image-in-vm. * gnu/ci.scm (qemu-jobs): Adapt to new API. * gnu/tests/install.scm (run-install): Ditto. * guix/scripts/system.scm (system-derivation-for-action): Ditto. --- gnu/build/image.scm | 275 +++++++++++++++++++++ gnu/ci.scm | 45 ++-- gnu/image.scm | 77 ++++++ gnu/local.mk | 3 + gnu/system/image.scm | 514 ++++++++++++++++++++++++++++++++++++++++ gnu/system/vm.scm | 17 +- gnu/tests/install.scm | 22 +- guix/scripts/system.scm | 13 +- 8 files changed, 917 insertions(+), 49 deletions(-) create mode 100644 gnu/build/image.scm create mode 100644 gnu/image.scm create mode 100644 gnu/system/image.scm diff --git a/gnu/build/image.scm b/gnu/build/image.scm new file mode 100644 index 0000000000..7c47bda344 --- /dev/null +++ b/gnu/build/image.scm @@ -0,0 +1,275 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Mathieu Othacehe +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu build image) + #:use-module (guix build store-copy) + #:use-module (guix build syscalls) + #:use-module (guix build utils) + #:use-module (guix store database) + #:use-module (gnu build bootloader) + #:use-module (gnu build install) + #:use-module (gnu build linux-boot) + #:use-module (gnu image) + #:use-module (gnu system uuid) + #:use-module (ice-9 ftw) + #:use-module (ice-9 match) + #:use-module (srfi srfi-19) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) + #:export (make-partition-image + genimage + initialize-efi-partition + initialize-root-partition + + make-iso9660-image)) + +(define (sexp->partition sexp) + "Take SEXP, a tuple as returned by 'partition->gexp', and turn it into a + record." + (match sexp + ((size file-system label uuid) + (partition (size size) + (file-system file-system) + (label label) + (uuid uuid))))) + +(define (size-in-kib size) + "Convert SIZE expressed in bytes, to kilobytes and return it as a string." + (number->string + (inexact->exact (ceiling (/ size 1024))))) + +(define (root-size root) + "Given the ROOT directory, evalute and return its size. As this doesn't take +the partition metadata size into account, take a 25% margin." + (* 1.25 (file-size root))) + +(define* (make-ext4-image partition target root + #:key (owner 0)) + "Handle the creation of EXT4 partition images. See 'make-partition-image'." + (let ((size (partition-size partition)) + (label (partition-label partition)) + (uuid (partition-uuid partition)) + (options "lazy_itable_init=1,lazy_journal_init=1")) + (invoke "mke2fs" "-t" "ext4" "-d" root + "-L" label "-U" (uuid->string uuid) + "-E" (format #f "root_owner=~a:~a,~a" + owner owner options) + target + (format #f "~ak" + (size-in-kib + (if (eq? size 'guess) + (root-size root) + size)))))) + +(define* (make-vfat-image partition target root) + "Handle the creation of VFAT partition images. See 'make-partition-image'." + (let ((size (partition-size partition)) + (label (partition-label partition))) + (invoke "mkdosfs" "-n" label "-C" target "-F" "16" "-S" "1024" + (size-in-kib + (if (eq? size 'guess) + (root-size root) + size))) + (for-each (lambda (file) + (unless (member file '("." "..")) + (invoke "mcopy" "-bsp" "-i" target + (string-append root "/" file) + (string-append "::" file)))) + (scandir root)))) + +(define* (make-partition-image partition-sexp target root) + "Create and return the image of PARTITION-SEXP as TARGET. Use the given ROOT +directory to populate the image." + (let* ((partition (sexp->partition partition-sexp)) + (type (partition-file-system partition))) + (cond + ((string=? type "ext4") + (make-ext4-image partition target root)) + ((string=? type "vfat") + (make-vfat-image partition target root)) + (else + (format (current-error-port) + "Unsupported partition type~%."))))) + +(define* (genimage config target) + "Use genimage to generate in TARGET directory, the image described in the +given CONFIG file." + ;; genimage needs a 'root' directory. + (mkdir "root") + (invoke "genimage" "--config" config + "--outputpath" target)) + +(define* (initialize-efi-partition root + #:key + bootloader-package + #:allow-other-keys) + "Install in ROOT directory, an EFI loader using BOOTLOADER-PACKAGE." + (install-efi-loader bootloader-package root)) + +(define (register-bootcfg-root target bootcfg) + "On file system TARGET, register BOOTCFG as a GC root." + (let ((directory (string-append target "/var/guix/gcroots"))) + (mkdir-p directory) + (symlink bootcfg (string-append directory "/bootcfg")))) + +(define* (register-closure prefix closure + #:key + (deduplicate? #t) (reset-timestamps? #t) + (schema (sql-schema))) + "Register CLOSURE in PREFIX, where PREFIX is the directory name of the +target store and CLOSURE is the name of a file containing a reference graph as +produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is +true, reset timestamps on store files and, if DEDUPLICATE? is true, +deduplicates files common to CLOSURE and the rest of PREFIX." + (let ((items (call-with-input-file closure read-reference-graph))) + (register-items items + #:prefix prefix + #:deduplicate? deduplicate? + #:reset-timestamps? reset-timestamps? + #:registration-time %epoch + #:schema schema))) + +(define* (initialize-root-partition root + #:key + bootcfg + bootcfg-location + (deduplicate? #t) + references-graphs + (register-closures? #t) + system-directory + #:allow-other-keys) + "Initialize the given ROOT directory. Use BOOTCFG and BOOTCFG-LOCATION to +install the bootloader configuration. + +If REGISTER-CLOSURES? is true, register REFERENCES-GRAPHS in the store. If +DEDUPLICATE? is true, then also deduplicate files common to CLOSURES and the +rest of the store when registering the closures. SYSTEM-DIRECTORY is the name +of the directory of the 'system' derivation." + (populate-root-file-system system-directory root) + (populate-store references-graphs root) + + (when register-closures? + (for-each (lambda (closure) + (register-closure root + closure + #:reset-timestamps? #t + #:deduplicate? deduplicate?)) + references-graphs)) + + (when bootcfg + (install-boot-config bootcfg bootcfg-location root) + + ;; Register BOOTCFG as a GC root. + (register-bootcfg-root root bootcfg))) + +(define* (make-iso9660-image xorriso grub-mkrescue-environment + grub bootcfg system-directory root target + #:key (volume-id "Guix_image") (volume-uuid #f) + register-closures? (references-graphs '()) + (compression? #t)) + "Given a GRUB package, creates an iso image as TARGET, using BOOTCFG as +GRUB configuration and OS-DRV as the stuff in it." + (define grub-mkrescue + (string-append grub "/bin/grub-mkrescue")) + + (define grub-mkrescue-sed.sh + (string-append (getcwd) "/" "grub-mkrescue-sed.sh")) + + ;; Use a modified version of grub-mkrescue-sed.sh, see below. + (copy-file (string-append xorriso + "/bin/grub-mkrescue-sed.sh") + grub-mkrescue-sed.sh) + + ;; Force grub-mkrescue-sed.sh to use the build directory instead of /tmp + ;; that is read-only inside the build container. + (substitute* grub-mkrescue-sed.sh + (("/tmp/") (string-append (getcwd) "/")) + (("MKRESCUE_SED_XORRISO_ARGS \\$x") + (format #f "MKRESCUE_SED_XORRISO_ARGS $(echo $x | sed \"s|/tmp|~a|\")" + (getcwd)))) + + ;; 'grub-mkrescue' calls out to mtools programs to create 'efi.img', a FAT + ;; file system image, and mtools honors SOURCE_DATE_EPOCH for the mtime of + ;; those files. The epoch for FAT is Jan. 1st 1980, not 1970, so choose + ;; that. + (setenv "SOURCE_DATE_EPOCH" + (number->string + (time-second + (date->time-utc (make-date 0 0 0 0 1 1 1980 0))))) + + ;; Our patched 'grub-mkrescue' honors this environment variable and passes + ;; it to 'mformat', which makes it the serial number of 'efi.img'. This + ;; allows for deterministic builds. + (setenv "GRUB_FAT_SERIAL_NUMBER" + (number->string (if volume-uuid + + ;; On 32-bit systems the 2nd argument must be + ;; lower than 2^32. + (string-hash (iso9660-uuid->string volume-uuid) + (- (expt 2 32) 1)) + + #x77777777) + 16)) + + (setenv "MKRESCUE_SED_MODE" "original") + (setenv "MKRESCUE_SED_XORRISO" (string-append xorriso "/bin/xorriso")) + (setenv "MKRESCUE_SED_IN_EFI_NO_PT" "yes") + + (for-each (match-lambda + ((name . value) (setenv name value))) + grub-mkrescue-environment) + + (apply invoke grub-mkrescue + (string-append "--xorriso=" grub-mkrescue-sed.sh) + "-o" target + (string-append "boot/grub/grub.cfg=" bootcfg) + root + "--" + ;; Set all timestamps to 1. + "-volume_date" "all_file_dates" "=1" + + `(,@(if compression? + '(;; ‘zisofs’ compression reduces the total image size by + ;; ~60%. + "-zisofs" "level=9:block_size=128k" ; highest compression + ;; It's transparent to our Linux-Libre kernel but not to + ;; GRUB. Don't compress the kernel, initrd, and other + ;; files read by grub.cfg, as well as common + ;; already-compressed file names. + "-find" "/" "-type" "f" + ;; XXX Even after "--" above, and despite documentation + ;; claiming otherwise, "-or" is stolen by grub-mkrescue + ;; which then chokes on it (as ‘-o …’) and dies. Don't use + ;; "-or". + "-not" "-wholename" "/boot/*" + "-not" "-wholename" "/System/*" + "-not" "-name" "unicode.pf2" + "-not" "-name" "bzImage" + "-not" "-name" "*.gz" ; initrd & all man pages + "-not" "-name" "*.png" ; includes grub-image.png + "-exec" "set_filter" "--zisofs" + "--") + '()) + "-volid" ,(string-upcase volume-id) + ,@(if volume-uuid + `("-volume_date" "uuid" + ,(string-filter (lambda (value) + (not (char=? #\- value))) + (iso9660-uuid->string + volume-uuid))) + '())))) diff --git a/gnu/ci.scm b/gnu/ci.scm index fb2596c809..0430cf594b 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -38,6 +38,7 @@ #:select (lookup-compressor self-contained-tarball)) #:use-module (gnu bootloader) #:use-module (gnu bootloader u-boot) + #:use-module (gnu image) #:use-module (gnu packages) #:use-module (gnu packages gcc) #:use-module (gnu packages base) @@ -49,6 +50,7 @@ #:use-module (gnu packages make-bootstrap) #:use-module (gnu packages package-management) #:use-module (gnu system) + #:use-module (gnu system image) #:use-module (gnu system vm) #:use-module (gnu system install) #:use-module (gnu tests) @@ -209,32 +211,23 @@ system.") (expt 2 20)) (if (member system %guixsd-supported-systems) - (if (member system %u-boot-systems) - (list (->job 'flash-image - (run-with-store store - (mbegin %store-monad - (set-guile-for-build (default-guile)) - (system-disk-image - (operating-system (inherit installation-os) - (bootloader (bootloader-configuration - (bootloader u-boot-bootloader) - (target #f)))) - #:disk-image-size - (* 1500 MiB)))))) - (list (->job 'usb-image - (run-with-store store - (mbegin %store-monad - (set-guile-for-build (default-guile)) - (system-disk-image installation-os - #:disk-image-size - (* 1500 MiB))))) - (->job 'iso9660-image - (run-with-store store - (mbegin %store-monad - (set-guile-for-build (default-guile)) - (system-disk-image installation-os - #:file-system-type - "iso9660")))))) + (list (->job 'usb-image + (run-with-store store + (mbegin %store-monad + (set-guile-for-build (default-guile)) + (system-image + (image + (inherit efi-disk-image) + (size (* 1500 MiB)) + (operating-system installation-os)))))) + (->job 'iso9660-image + (run-with-store store + (mbegin %store-monad + (set-guile-for-build (default-guile)) + (system-image + (image + (inherit iso9660-image) + (operating-system installation-os))))))) '())) (define channel-build-system diff --git a/gnu/image.scm b/gnu/image.scm new file mode 100644 index 0000000000..e250741c98 --- /dev/null +++ b/gnu/image.scm @@ -0,0 +1,77 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Mathieu Othacehe +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu image) + #:use-module (guix records) + #:use-module (ice-9 match) + #:export (partition + partition? + partition-device + partition-size + partition-file-system + partition-label + partition-uuid + partition-flags + partition-initializer + + image + image-name + image-format + image-size + image-operating-system + image-partitions + image-compression? + image-volatile-root? + image-substitutable?)) + + +;;; +;;; Partition record. +;;; + +(define-record-type* partition make-partition + partition? + (device partition-device (default #f)) + (size partition-size) + (file-system partition-file-system (default "ext4")) + (label partition-label (default #f)) + (uuid partition-uuid (default #f)) + (flags partition-flags (default '())) + (initializer partition-initializer (default #f))) + + +;;; +;;; Image record. +;;; + +(define-record-type* + image make-image + image? + (format image-format) ;symbol + (size image-size ;size in bytes as integer + (default 'guess)) + (operating-system image-operating-system ; + (default #f)) + (partitions image-partitions ;list of + (default '())) + (compression? image-compression? ;boolean + (default #t)) + (volatile-root? image-volatile-root? ;boolean + (default #t)) + (substitutable? image-substitutable? ;boolean + (default #t))) diff --git a/gnu/local.mk b/gnu/local.mk index 9f212434a9..408063a36e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -61,6 +61,7 @@ GNU_SYSTEM_MODULES = \ %D%/bootloader/u-boot.scm \ %D%/bootloader/depthcharge.scm \ %D%/ci.scm \ + %D%/image.scm \ %D%/packages.scm \ %D%/packages/abduco.scm \ %D%/packages/abiword.scm \ @@ -602,6 +603,7 @@ GNU_SYSTEM_MODULES = \ %D%/system.scm \ %D%/system/accounts.scm \ %D%/system/file-systems.scm \ + %D%/system/image.scm \ %D%/system/install.scm \ %D%/system/keyboard.scm \ %D%/system/linux-container.scm \ @@ -622,6 +624,7 @@ GNU_SYSTEM_MODULES = \ %D%/build/activation.scm \ %D%/build/bootloader.scm \ %D%/build/cross-toolchain.scm \ + %D%/build/image.scm \ %D%/build/file-systems.scm \ %D%/build/install.scm \ %D%/build/linux-boot.scm \ diff --git a/gnu/system/image.scm b/gnu/system/image.scm new file mode 100644 index 0000000000..d4d2e2eb79 --- /dev/null +++ b/gnu/system/image.scm @@ -0,0 +1,514 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Mathieu Othacehe +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu system image) + #:use-module (guix gexp) + #:use-module (guix modules) + #:use-module (guix records) + #:use-module (guix utils) + #:use-module ((guix self) #:select (make-config.scm)) + #:use-module (gnu bootloader) + #:use-module (gnu bootloader grub) + #:use-module (gnu image) + #:use-module (gnu services) + #:use-module (gnu services base) + #:use-module (gnu system) + #:use-module (gnu system file-systems) + #:use-module (gnu system uuid) + #:use-module (gnu system vm) + #:use-module (guix packages) + #:use-module (gnu packages base) + #:use-module (gnu packages bootloaders) + #:use-module (gnu packages cdrom) + #:use-module (gnu packages disk) + #:use-module (gnu packages gawk) + #:use-module (gnu packages genimage) + #:use-module (gnu packages guile) + #:autoload (gnu packages gnupg) (guile-gcrypt) + #:use-module (gnu packages linux) + #:use-module (gnu packages mtools) + #:use-module ((srfi srfi-1) #:prefix scm:) + #:use-module (srfi srfi-11) + #:use-module (srfi srfi-26) + #:use-module (rnrs bytevectors) + #:use-module (ice-9 match) + #:export (esp-partition + root-partition + + efi-disk-image + iso9660-image + + find-image + system-image)) + + +;;; +;;; Images definitions. +;;; + +(define esp-partition + (partition + (size (* 40 (expt 2 20))) + (label "GNU-ESP") ;cosmetic only + ;; Use "vfat" here since this property is used + ;; when mounting. The actual FAT-ness is based + ;; on file system size (16 in this case). + (file-system "vfat") + (flags '(esp)) + (initializer (gexp initialize-efi-partition)))) + +(define root-partition + (partition + (size 'guess) + (label "Guix_image") + (file-system "ext4") + (flags '(boot)) + (initializer (gexp initialize-root-partition)))) + +(define efi-disk-image + (image + (format 'disk-image) + (partitions (list esp-partition root-partition)))) + +(define iso9660-image + (image + (format 'iso9660) + (partitions + (list (partition + (size 'guess) + (label "GUIX_IMAGE") + (flags '(boot))))) + ;; XXX: Temporarily disable compression to speed-up the tests. + (compression? #f))) + + +;; +;; Helpers. +;; + +(define (root-uuid image) + ;; UUID of the root file system, computed in a deterministic fashion. + ;; This is what we use to locate the root file system so it has to be + ;; different from the user's own file system UUIDs. + (let ((os (image-operating-system image)) + (type (if (eq? (image-format image) 'iso9660) + 'iso9660 + 'dce))) + (operating-system-uuid os type))) + +(define not-config? + ;; Select (guix …) and (gnu …) modules, except (guix config). + (match-lambda + (('guix 'config) #f) + (('guix rest ...) #t) + (('gnu rest ...) #t) + (rest #f))) + +(define (partition->gexp partition) + "Turn PARTITION, a object, into a list-valued gexp suitable for +'make-partition-image'." + #~'(#$@(list (partition-size partition)) + #$(partition-file-system partition) + #$(partition-label partition) + #$(and=> (partition-uuid partition) + uuid-bytevector))) + +(define gcrypt-sqlite3&co + ;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs. + (scm:append-map + (lambda (package) + (cons package + (match (package-transitive-propagated-inputs package) + (((labels packages) ...) + packages)))) + (list guile-gcrypt guile-sqlite3))) + +(define-syntax-rule (with-imported-modules* exp ...) + (with-extensions gcrypt-sqlite3&co + (with-imported-modules `(,@(source-module-closure + '((gnu build vm) + (gnu build image) + (guix store database)) + #:select? not-config?) + ((guix config) => ,(make-config.scm))) + #~(begin + (use-modules (gnu build vm) + (gnu build image) + (guix store database) + (guix build utils)) + exp ...)))) + + +;; +;; Disk image. +;; + +(define* (system-disk-image image + #:key + (name "disk-image") + bootcfg + bootloader + register-closures? + (inputs '())) + "Return the derivation of the disk-image described by IMAGE. Said image can +be copied on a USB stick as is. BOOTLOADER is the bootloader that will be +installed and configured according to BOOTCFG parameter. + +Raw images of the IMAGE partitions are first created. Then, genimage is used +to assemble the partition images into a disk-image without resorting to a +virtual machine. + +INPUTS is a list of inputs (as for packages). When REGISTER-CLOSURES? is +true, register INPUTS in the store database of the image so that Guix can be +used in the image." + + (define genimage-name "image") + + (define (image->genimage-cfg image) + "Return as a file-like object, the genimage configuration file describing +the given IMAGE." + (define (format->image-type format) + "Return the genimage format corresponding to FORMAT. For now, only the +hdimage format (raw disk-image) is supported." + (case format + ((disk-image) "hdimage") + (else + (error + (format #f "Unsupported image type ~a~%." format))))) + + (define (partition->dos-type partition) + "Return the MBR partition type corresponding to the given PARTITION. +See: https://en.wikipedia.org/wiki/Partition_type." + (let ((flags (partition-flags partition))) + (cond + ((member 'esp flags) "0xEF") + (else "0x83")))) + + (define (partition-image partition) + "Return as a file-like object, an image of the given PARTITION. A +directory, filled by calling the PARTITION initializer procedure, is first +created within the store. Then, an image of this directory is created using +tools such as 'mke2fs' or 'mkdosfs', depending on the partition file-system +type." + (let* ((os (image-operating-system image)) + (schema (local-file (search-path %load-path + "guix/store/schema.sql"))) + (graph (match inputs + (((names . _) ...) + names))) + (root-builder + (with-imported-modules* + (let* ((initializer #$(partition-initializer partition))) + (sql-schema #$schema) + + ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be + ;; decoded. + (setenv "GUIX_LOCPATH" + #+(file-append glibc-utf8-locales "/lib/locale")) + (setlocale LC_ALL "en_US.utf8") + + (initializer #$output + #:references-graphs '#$graph + #:deduplicate? #f + #:system-directory #$os + #:bootloader-package + #$(bootloader-package bootloader) + #:bootcfg #$bootcfg + #:bootcfg-location + #$(bootloader-configuration-file bootloader))))) + (image-root + (computed-file "partition-image-root" root-builder + #:options `(#:references-graphs ,inputs))) + (type (partition-file-system partition)) + (image-builder + (with-imported-modules* + (let ((inputs '#$(list e2fsprogs dosfstools mtools))) + (set-path-environment-variable "PATH" '("bin" "sbin") inputs) + (make-partition-image #$(partition->gexp partition) + #$output + #$image-root))))) + (computed-file "partition.img" image-builder))) + + (define (partition->config partition) + "Return the genimage partition configuration for PARTITION." + (let ((label (partition-label partition)) + (dos-type (partition->dos-type partition)) + (image (partition-image partition))) + #~(format #f "~/partition ~a { +~/~/partition-type = ~a +~/~/image = \"~a\" +~/}" #$label #$dos-type #$image))) + + (let* ((format (image-format image)) + (image-type (format->image-type format)) + (partitions (image-partitions image)) + (partitions-config (map partition->config partitions)) + (builder + #~(begin + (let ((format (@ (ice-9 format) format))) + (call-with-output-file #$output + (lambda (port) + (format port + "\ +image ~a { +~/~a {} +~{~a~^~%~} +}~%" #$genimage-name #$image-type (list #$@partitions-config)))))))) + (computed-file "genimage.cfg" builder))) + + (let* ((substitutable? (image-substitutable? image)) + (builder + (with-imported-modules* + (let ((inputs '#$(list genimage coreutils findutils))) + (set-path-environment-variable "PATH" '("bin" "sbin") inputs) + (genimage #$(image->genimage-cfg image) #$output)))) + (image-dir (computed-file "image-dir" builder))) + (gexp->derivation name + #~(symlink + (string-append #$image-dir "/" #$genimage-name) + #$output) + #:substitutable? substitutable?))) + + +;; +;; ISO9660 image. +;; + +(define (has-guix-service-type? os) + "Return true if OS contains a service of the type GUIX-SERVICE-TYPE." + (not (not (scm:find (lambda (service) + (eq? (service-kind service) guix-service-type)) + (operating-system-services os))))) + +(define* (system-iso9660-image image + #:key + (name "iso9660-image") + bootcfg + bootloader + register-closures? + (inputs '()) + (grub-mkrescue-environment '())) + "Return a bootable, stand-alone iso9660 image. + +INPUTS is a list of inputs (as for packages). When REGISTER-CLOSURES? is +true, register INPUTS in the store database of the image so that Guix can be +used in the image. " + (define root-label + (match (image-partitions image) + ((partition) + (partition-label partition)))) + + (define root-uuid + (match (image-partitions image) + ((partition) + (uuid-bytevector (partition-uuid partition))))) + + (let* ((os (image-operating-system image)) + (bootloader (bootloader-package bootloader)) + (compression? (image-compression? image)) + (substitutable? (image-substitutable? image)) + (schema (local-file (search-path %load-path + "guix/store/schema.sql"))) + (graph (match inputs + (((names . _) ...) + names))) + (root-builder + (with-imported-modules* + (sql-schema #$schema) + + ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded. + (setenv "GUIX_LOCPATH" + #+(file-append glibc-utf8-locales "/lib/locale")) + (setlocale LC_ALL "en_US.utf8") + + (initialize-root-partition #$output + #:references-graphs '#$graph + #:deduplicate? #f + #:system-directory #$os))) + (image-root + (computed-file "image-root" root-builder + #:options `(#:references-graphs ,inputs))) + (builder + (with-imported-modules* + (let* ((inputs '#$(list parted e2fsprogs dosfstools xorriso + sed grep coreutils findutils gawk))) + (set-path-environment-variable "PATH" '("bin" "sbin") inputs) + (make-iso9660-image #$xorriso + '#$grub-mkrescue-environment + #$bootloader + #$bootcfg + #$os + #$image-root + #$output + #:references-graphs '#$graph + #:register-closures? #$register-closures? + #:compression? #$compression? + #:volume-id #$root-label + #:volume-uuid #$root-uuid))))) + (gexp->derivation name builder + #:references-graphs inputs + #:substitutable? substitutable?))) + + +;; +;; Image creation. +;; + +(define (root-partition? partition) + "Return true if PARTITION is the root partition, false otherwise." + (member 'boot (partition-flags partition))) + +(define (find-root-partition image) + "Return the root partition of the given IMAGE." + (scm:find root-partition? (image-partitions image))) + +(define (image->root-file-system image) + "Return the IMAGE root partition file-system type." + (let ((format (image-format image))) + (if (eq? format 'iso9660) + "iso9660" + (partition-file-system (find-root-partition image))))) + +(define (root-size image) + "Return the root partition size of IMAGE." + (let* ((image-size (image-size image)) + (root-partition (find-root-partition image)) + (root-size (partition-size root-partition))) + (cond + ((and (eq? root-size 'guess) image-size) + image-size) + (else root-size)))) + +(define* (image-with-os base-image os + #:key root-uuid root-size) + "Return an image based on BASE-IMAGE but with the operating-system field set +to OS. Also set the UUID and the size of the root partition to ROOT-UUID and +ROOT-SIZE respectively." + (let*-values (((partitions) (image-partitions base-image)) + ((root-partition other-partitions) + (scm:partition root-partition? partitions))) + (image + (inherit base-image) + (operating-system os) + (partitions + (cons (partition + (inherit (car root-partition)) + (uuid root-uuid) + (size root-size)) + other-partitions))))) + +(define* (make-system-image image) + "Return the derivation of IMAGE. It can be a raw disk-image or an ISO9660 +image, depending on IMAGE format." + (let* ((image-os (image-operating-system image)) + (format (image-format image)) + (file-systems-to-keep + (scm:remove + (lambda (fs) + (string=? (file-system-mount-point fs) "/")) + (operating-system-file-systems image-os))) + (root-file-system-type (image->root-file-system image)) + (substitutable? (image-substitutable? image)) + (volatile-root? (image-volatile-root? image)) + (os (operating-system + (inherit image-os) + (initrd (lambda (file-systems . rest) + (apply (operating-system-initrd image-os) + file-systems + #:volatile-root? volatile-root? + rest))) + (bootloader (if (eq? format 'iso9660) + (bootloader-configuration + (inherit + (operating-system-bootloader image-os)) + (bootloader grub-mkrescue-bootloader)) + (operating-system-bootloader image-os))) + (file-systems (cons (file-system + (mount-point "/") + (device "/dev/placeholder") + (type root-file-system-type)) + file-systems-to-keep)))) + (uuid (root-uuid image)) + (os (operating-system + (inherit os) + (file-systems (cons (file-system + (mount-point "/") + (device uuid) + (type root-file-system-type)) + file-systems-to-keep)))) + (image* (image-with-os image os + #:root-uuid uuid + #:root-size (root-size image))) + (register-closures? (has-guix-service-type? os)) + (bootcfg (operating-system-bootcfg os)) + (bootloader (bootloader-configuration-bootloader + (operating-system-bootloader os)))) + (case (image-format image) + ((disk-image) + (system-disk-image image* + #:bootcfg bootcfg + #:bootloader bootloader + #:register-closures? register-closures? + #:inputs `(("system" ,os) + ("bootcfg" ,bootcfg)))) + ((iso9660) + (system-iso9660-image image* + #:bootcfg bootcfg + #:bootloader bootloader + #:register-closures? register-closures? + #:inputs `(("system" ,os) + ("bootcfg" ,bootcfg)) + #:grub-mkrescue-environment + '(("MKRESCUE_SED_MODE" . "mbr_hfs"))))))) + +(define (find-image file-system-type) + "Find and return an image that could match the given FILE-SYSTEM-TYPE. This +is useful to adapt to interfaces written before the addition of the +record." + ;; XXX: Add support for system and target here, or in the caller. + (match file-system-type + ("iso9660" iso9660-image) + (_ efi-disk-image))) + +(define (system-image image) + "Wrap 'make-system-image' call, so that it is used only if the given IMAGE +is supported. Otherwise, fallback to image creation in a VM. This is temporary +and should be removed once 'make-system-image' is able to deal with all types +of images." + (let* ((image-os (image-operating-system image)) + (image-root-filesystem-type (image->root-file-system image)) + (bootloader (bootloader-configuration-bootloader + (operating-system-bootloader image-os))) + (bootloader-name (bootloader-name bootloader)) + (size (image-size image)) + (substitutable? (image-substitutable? image)) + (volatile? (image-volatile-root? image)) + (format (image-format image))) + (if (and (or (eq? bootloader-name 'grub) + (eq? bootloader-name 'extlinux)) + (eq? format 'disk-image)) + ;; Fallback to image creation in a VM when it is not yet supported by + ;; this module. + (system-disk-image-in-vm image-os + #:disk-image-size size + #:file-system-type image-root-filesystem-type + #:volatile? volatile? + #:substitutable? substitutable?) + (make-system-image image)))) + +;;; image.scm ends here diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 2fdf954883..37840ce355 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -77,7 +77,7 @@ system-qemu-image/shared-store system-qemu-image/shared-store-script - system-disk-image + system-disk-image-in-vm system-docker-image virtual-machine @@ -604,14 +604,13 @@ system." ;;; VM and disk images. ;;; - -(define* (system-disk-image os - #:key - (name "disk-image") - (file-system-type "ext4") - (disk-image-size (* 900 (expt 2 20))) - (volatile? #t) - (substitutable? #t)) +(define* (system-disk-image-in-vm os + #:key + (name "disk-image") + (file-system-type "ext4") + (disk-image-size (* 900 (expt 2 20))) + (volatile? #t) + (substitutable? #t)) "Return the derivation of a disk image of DISK-IMAGE-SIZE bytes of the system described by OS. Said image can be copied on a USB stick as is. When VOLATILE? is true, the root file system is made volatile; this is useful diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 8650474fbc..d8d495589e 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -21,9 +21,11 @@ (define-module (gnu tests install) #:use-module (gnu) #:use-module (gnu bootloader extlinux) + #:use-module (gnu image) #:use-module (gnu tests) #:use-module (gnu tests base) #:use-module (gnu system) + #:use-module (gnu system image) #:use-module (gnu system install) #:use-module (gnu system vm) #:use-module ((gnu build vm) #:select (qemu-command)) @@ -227,14 +229,18 @@ packages defined in installation-os." ;; we cheat a little bit by adding TARGET to its GC ;; roots. This way, we know 'guix system init' will ;; succeed. - (image (system-disk-image - (operating-system-with-gc-roots - os (list target)) - #:disk-image-size install-size - #:file-system-type - installation-disk-image-file-system-type - ;; Don't provide substitutes; too big. - #:substitutable? #f))) + (image + (system-image + (image + (inherit + (find-image + installation-disk-image-file-system-type)) + (size install-size) + (operating-system + (operating-system-with-gc-roots + os (list target))) + ;; Don't provide substitutes; too big. + (substitutable? #f))))) (define install (with-imported-modules '((guix build utils) (gnu build marionette)) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 2664c66a30..3c8691a08c 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -54,9 +54,11 @@ #:autoload (gnu build linux-modules) (device-module-aliases matching-modules) #:use-module (gnu system linux-initrd) + #:use-module (gnu image) #:use-module (gnu system) #:use-module (gnu bootloader) #:use-module (gnu system file-systems) + #:use-module (gnu system image) #:use-module (gnu system mapped-devices) #:use-module (gnu system linux-container) #:use-module (gnu system uuid) @@ -692,12 +694,11 @@ checking this by themselves in their 'check' procedure." (* 70 (expt 2 20))) #:mappings mappings)) ((disk-image) - (system-disk-image os - #:name (match file-system-type - ("iso9660" "image.iso") - (_ "disk-image")) - #:disk-image-size image-size - #:file-system-type file-system-type)) + (system-image + (image + (inherit (find-image file-system-type)) + (size image-size) + (operating-system os)))) ((docker-image) (system-docker-image os)))) From patchwork Wed Apr 29 08:47:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 21748 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DD3A427BBE4; Wed, 29 Apr 2020 09:54:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 0A64727BBE1 for ; Wed, 29 Apr 2020 09:54:19 +0100 (BST) Received: from localhost ([::1]:42202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiTy-0000ZO-Jh for patchwork@mira.cbaines.net; Wed, 29 Apr 2020 04:54:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57096) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiQN-00075O-DG for guix-patches@gnu.org; Wed, 29 Apr 2020 04:54:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTiOu-0002y0-DZ for guix-patches@gnu.org; Wed, 29 Apr 2020 04:50:35 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59083) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTiOt-0002xQ-V6 for guix-patches@gnu.org; Wed, 29 Apr 2020 04:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTiOt-0005Dk-TX for guix-patches@gnu.org; Wed, 29 Apr 2020 04:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40955] [PATCH 5/5] vm: Remove obsolete procedures. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Apr 2020 08:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40955 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40955@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 40955-submit@debbugs.gnu.org id=B40955.158815010819989 (code B ref 40955); Wed, 29 Apr 2020 08:49:03 +0000 Received: (at 40955) by debbugs.gnu.org; 29 Apr 2020 08:48:28 +0000 Received: from localhost ([127.0.0.1]:42392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTiOJ-0005CL-SL for submit@debbugs.gnu.org; Wed, 29 Apr 2020 04:48:28 -0400 Received: from mail-wr1-f42.google.com ([209.85.221.42]:37079) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTiO5-0005B8-AJ for 40955@debbugs.gnu.org; Wed, 29 Apr 2020 04:48:26 -0400 Received: by mail-wr1-f42.google.com with SMTP id k1so1491639wrx.4 for <40955@debbugs.gnu.org>; Wed, 29 Apr 2020 01:48:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sH6JqNzVbU6k8uYPDjZznYmC/UEBhwe8teTdYa05Xhk=; b=Wc6JM4u6qmpP5buu0Sv8hWsi0pSP/wjj8V15/C0u0/tKtAt+90XpKykuMAD2wFhXTY nw5cl8GYXTXfqHxTsiNuvmEExlP70k1Ivljx6jDmRwNwDl1b3+nTqLfEbBW1tb1GaS/L bP8/31y3MICJufzRll9AMORdv/eiTw1gV0RxMJkg3eZFVtOsfS9xN4AgDcw7TsZtuWUE BPQbyFXWziLAM8JgkkfMXwP7fcDCW8uSwgKqL2m6AYqdvF2Zwla3lwUWQXmJv2rj1IU9 EUqFgVALTl+jdWp8GlRqyCrswkt9bg9Wgl1H7MfUCc4P9CsS9JTAnqVexWudmBQ+x4qL fltg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sH6JqNzVbU6k8uYPDjZznYmC/UEBhwe8teTdYa05Xhk=; b=WPfaeTqLh0gqFe4yUSUn9Ef0VQODkHofOhEdGBvFHCMHWE8n0vzAeTG2eTCza59vIX FwD/Cg1V1qPn1WH+VXwCF8ct/TctmoTdVrWaTqVqE1mH4Vrfham3m/0tSaZVHLY0xlTn hwE3/Ox0PqKJ+OiM5JsRoYCA+lMCEDRXmujaUESFURIaUiKn0kOft+rkI+EEVOpMC93j Cl4uviSqTUDo/84xhpPb+YyKCkiSokhBFnWlR9hwHF6DDvPpWocL9vEd46Vd+ExEVLoV Vj9Vt6WxSONJ+EEA2uh5qry7mbJOiQt6g0Ludu9EuC8xZsS+Fs02g5w3jWwYvbzrqL+2 xynA== X-Gm-Message-State: AGi0PuYfHiWg87NeOiICZ59iJSPHNZyKkSBKeBe32X4ot/i6RdxzFIou S4pIy5TtJzZWqxU5Jb6dApLQOBFi X-Google-Smtp-Source: APiQypIi6aITF9UljaUyNNkbbt1oj4alroKOj21WOnayS7FtjUM3tCYZHVz7jpG+kXuhch8yNrlQXQ== X-Received: by 2002:adf:8b1d:: with SMTP id n29mr37084421wra.196.1588150086635; Wed, 29 Apr 2020 01:48:06 -0700 (PDT) Received: from meru.fronius.com ([2a01:cb18:832e:5f00:e9fd:9d65:b691:fcb3]) by smtp.gmail.com with ESMTPSA id x132sm6812621wmg.33.2020.04.29.01.48.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 01:48:05 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 29 Apr 2020 10:47:56 +0200 Message-Id: <20200429084756.25072-5-m.othacehe@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200429084756.25072-1-m.othacehe@gmail.com> References: <20200429084756.25072-1-m.othacehe@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/build/vm.scm (install-efi, make-iso9660-image): Remove those procedures that are now implemented in (gnu build image) module, (initialize-hard-disk): remove efi support. * gnu/system/vm.scm (iso9660-image): Remove it, (qemu-image): adapt it to remove ISO9660 support. --- gnu/build/vm.scm | 156 +--------------------------------------------- gnu/system/vm.scm | 151 +++++--------------------------------------- 2 files changed, 18 insertions(+), 289 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index bc6071daa9..1a888b1a51 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -57,8 +57,7 @@ estimated-partition-size root-partition-initializer initialize-partition-table - initialize-hard-disk - make-iso9660-image)) + initialize-hard-disk)) ;;; Commentary: ;;; @@ -417,159 +416,6 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation." (mkdir-p directory) (symlink bootcfg (string-append directory "/bootcfg")))) -(define (install-efi grub esp config-file) - "Write a self-contained GRUB EFI loader to the mounted ESP using CONFIG-FILE." - (let* ((system %host-type) - ;; Hard code the output location to a well-known path recognized by - ;; compliant firmware. See "3.5.1.1 Removable Media Boot Behaviour": - ;; http://www.uefi.org/sites/default/files/resources/UEFI%20Spec%202_6.pdf - (grub-mkstandalone (string-append grub "/bin/grub-mkstandalone")) - (efi-directory (string-append esp "/EFI/BOOT")) - ;; Map grub target names to boot file names. - (efi-targets (cond ((string-prefix? "x86_64" system) - '("x86_64-efi" . "BOOTX64.EFI")) - ((string-prefix? "i686" system) - '("i386-efi" . "BOOTIA32.EFI")) - ((string-prefix? "armhf" system) - '("arm-efi" . "BOOTARM.EFI")) - ((string-prefix? "aarch64" system) - '("arm64-efi" . "BOOTAA64.EFI"))))) - ;; grub-mkstandalone requires a TMPDIR to prepare the firmware image. - (setenv "TMPDIR" esp) - - (mkdir-p efi-directory) - (invoke grub-mkstandalone "-O" (car efi-targets) - "-o" (string-append efi-directory "/" - (cdr efi-targets)) - ;; Graft the configuration file onto the image. - (string-append "boot/grub/grub.cfg=" config-file)))) - -(define* (make-iso9660-image xorriso grub-mkrescue-environment - grub config-file os-drv target - #:key (volume-id "Guix_image") (volume-uuid #f) - register-closures? (closures '())) - "Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as -GRUB configuration and OS-DRV as the stuff in it." - (define grub-mkrescue - (string-append grub "/bin/grub-mkrescue")) - - (define grub-mkrescue-sed.sh - (string-append xorriso "/bin/grub-mkrescue-sed.sh")) - - (define target-store - (string-append "/tmp/root" (%store-directory))) - - (define items - ;; The store items to add to the image. - (delete-duplicates - (append-map (lambda (closure) - (map store-info-item - (call-with-input-file (string-append "/xchg/" closure) - read-reference-graph))) - closures))) - - (populate-root-file-system os-drv "/tmp/root") - (mount (%store-directory) target-store "" MS_BIND) - - (when register-closures? - (display "registering closures...\n") - (for-each (lambda (closure) - (register-closure - "/tmp/root" - (string-append "/xchg/" closure) - - ;; TARGET-STORE is a read-only bind-mount so we shouldn't try - ;; to modify it. - #:deduplicate? #f - #:reset-timestamps? #f)) - closures) - (register-bootcfg-root "/tmp/root" config-file)) - - ;; 'grub-mkrescue' calls out to mtools programs to create 'efi.img', a FAT - ;; file system image, and mtools honors SOURCE_DATE_EPOCH for the mtime of - ;; those files. The epoch for FAT is Jan. 1st 1980, not 1970, so choose - ;; that. - (setenv "SOURCE_DATE_EPOCH" - (number->string - (time-second - (date->time-utc (make-date 0 0 0 0 1 1 1980 0))))) - - ;; Our patched 'grub-mkrescue' honors this environment variable and passes - ;; it to 'mformat', which makes it the serial number of 'efi.img'. This - ;; allows for deterministic builds. - (setenv "GRUB_FAT_SERIAL_NUMBER" - (number->string (if volume-uuid - - ;; On 32-bit systems the 2nd argument must be - ;; lower than 2^32. - (string-hash (iso9660-uuid->string volume-uuid) - (- (expt 2 32) 1)) - - #x77777777) - 16)) - - (setenv "MKRESCUE_SED_MODE" "original") - (setenv "MKRESCUE_SED_XORRISO" (string-append xorriso - "/bin/xorriso")) - (setenv "MKRESCUE_SED_IN_EFI_NO_PT" "yes") - (for-each (match-lambda - ((name . value) (setenv name value))) - grub-mkrescue-environment) - - (let ((pipe - (apply open-pipe* OPEN_WRITE - grub-mkrescue - (string-append "--xorriso=" grub-mkrescue-sed.sh) - "-o" target - (string-append "boot/grub/grub.cfg=" config-file) - "etc=/tmp/root/etc" - "var=/tmp/root/var" - "run=/tmp/root/run" - ;; /mnt is used as part of the installation - ;; process, as the mount point for the target - ;; file system, so create it. - "mnt=/tmp/root/mnt" - "-path-list" "-" - "--" - - ;; Set all timestamps to 1. - "-volume_date" "all_file_dates" "=1" - - ;; ‘zisofs’ compression reduces the total image size by ~60%. - "-zisofs" "level=9:block_size=128k" ; highest compression - ;; It's transparent to our Linux-Libre kernel but not to GRUB. - ;; Don't compress the kernel, initrd, and other files read by - ;; grub.cfg, as well as common already-compressed file names. - "-find" "/" "-type" "f" - ;; XXX Even after "--" above, and despite documentation claiming - ;; otherwise, "-or" is stolen by grub-mkrescue which then chokes - ;; on it (as ‘-o …’) and dies. Don't use "-or". - "-not" "-wholename" "/boot/*" - "-not" "-wholename" "/System/*" - "-not" "-name" "unicode.pf2" - "-not" "-name" "bzImage" - "-not" "-name" "*.gz" ; initrd & all man pages - "-not" "-name" "*.png" ; includes grub-image.png - "-exec" "set_filter" "--zisofs" - "--" - - "-volid" (string-upcase volume-id) - (if volume-uuid - `("-volume_date" "uuid" - ,(string-filter (lambda (value) - (not (char=? #\- value))) - (iso9660-uuid->string - volume-uuid))) - `())))) - ;; Pass lines like 'gnu/store/…-x=/gnu/store/…-x' corresponding to the - ;; '-path-list -' option. - (for-each (lambda (item) - (format pipe "~a=~a~%" - (string-drop item 1) item)) - items) - (unless (zero? (close-pipe pipe)) - (error "oh, my! grub-mkrescue failed" grub-mkrescue)))) - (define* (initialize-hard-disk device #:key bootloader-package diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 37840ce355..1cab8997b4 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -269,95 +269,6 @@ substitutable." (eq? (service-kind service) guix-service-type)) (operating-system-services os))))) -(define* (iso9660-image #:key - (name "iso9660-image") - file-system-label - file-system-uuid - (system (%current-system)) - (target (%current-target-system)) - (qemu qemu-minimal) - os - bootcfg-drv - bootloader - (register-closures? (has-guix-service-type? os)) - (inputs '()) - (grub-mkrescue-environment '()) - (substitutable? #t)) - "Return a bootable, stand-alone iso9660 image. - -INPUTS is a list of inputs (as for packages)." - (define schema - (and register-closures? - (local-file (search-path %load-path - "guix/store/schema.sql")))) - - (expression->derivation-in-linux-vm - name - (with-extensions gcrypt-sqlite3&co - (with-imported-modules `(,@(source-module-closure '((gnu build vm) - (guix store database) - (guix build utils)) - #:select? not-config?) - ((guix config) => ,(make-config.scm))) - #~(begin - (use-modules (gnu build vm) - (guix store database) - (guix build utils)) - - (sql-schema #$schema) - - ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded. - (setenv "GUIX_LOCPATH" - #+(file-append glibc-utf8-locales "/lib/locale")) - (setlocale LC_ALL "en_US.utf8") - - (let ((inputs - '#$(append (list parted e2fsprogs dosfstools xorriso) - (map canonical-package - (list sed grep coreutils findutils gawk)))) - - - (graphs '#$(match inputs - (((names . _) ...) - names))) - ;; This variable is unused but allows us to add INPUTS-TO-COPY - ;; as inputs. - (to-register - '#$(map (match-lambda - ((name thing) thing) - ((name thing output) `(,thing ,output))) - inputs))) - - (set-path-environment-variable "PATH" '("bin" "sbin") inputs) - (make-iso9660-image #$xorriso - '#$grub-mkrescue-environment - #$(bootloader-package bootloader) - #$bootcfg-drv - #$os - "/xchg/guixsd.iso" - #:register-closures? #$register-closures? - #:closures graphs - #:volume-id #$file-system-label - #:volume-uuid #$(and=> file-system-uuid - uuid-bytevector)))))) - #:system system - #:target target - - ;; Keep a local file system for /tmp so that we can populate it directly as - ;; root and have files owned by root. See . - #:file-systems (remove (lambda (file-system) - (string=? (file-system-mount-point file-system) - "/tmp")) - %linux-vm-file-systems) - - #:make-disk-image? #f - #:single-file-output? #t - #:references-graphs inputs - #:substitutable? substitutable? - - ;; Xorriso seems to be quite memory-hungry, so increase the VM's RAM size. - #:memory-size 512)) - (define* (qemu-image #:key (name "qemu-image") (system (%current-system)) @@ -618,25 +529,14 @@ to USB sticks meant to be read-only. SUBSTITUTABLE? determines whether the returned derivation should be marked as substitutable." - (define normalize-label - ;; ISO labels are all-caps (case-insensitive), but since - ;; 'find-partition-by-label' is case-sensitive, make it all-caps here. - (if (string=? "iso9660" file-system-type) - string-upcase - identity)) - (define root-label - ;; Volume name of the root file system. - (normalize-label "Guix_image")) + "Guix_image") (define (root-uuid os) ;; UUID of the root file system, computed in a deterministic fashion. ;; This is what we use to locate the root file system so it has to be ;; different from the user's own file system UUIDs. - (operating-system-uuid os - (if (string=? file-system-type "iso9660") - 'iso9660 - 'dce))) + (operating-system-uuid os 'dce)) (define file-systems-to-keep (remove (lambda (fs) @@ -653,11 +553,7 @@ substitutable." #:volatile-root? volatile? rest))) - (bootloader (if (string=? "iso9660" file-system-type) - (bootloader-configuration - (inherit (operating-system-bootloader os)) - (bootloader grub-mkrescue-bootloader)) - (operating-system-bootloader os))) + (bootloader (operating-system-bootloader os)) ;; Force our own root file system. (We need a "/" file system ;; to call 'root-uuid'.) @@ -675,33 +571,20 @@ substitutable." (type file-system-type)) file-systems-to-keep)))) (bootcfg (operating-system-bootcfg os))) - (if (string=? "iso9660" file-system-type) - (iso9660-image #:name name - #:file-system-label root-label - #:file-system-uuid uuid - #:os os - #:bootcfg-drv bootcfg - #:bootloader (bootloader-configuration-bootloader - (operating-system-bootloader os)) - #:inputs `(("system" ,os) - ("bootcfg" ,bootcfg)) - #:grub-mkrescue-environment - '(("MKRESCUE_SED_MODE" . "mbr_hfs")) - #:substitutable? substitutable?) - (qemu-image #:name name - #:os os - #:bootcfg-drv bootcfg - #:bootloader (bootloader-configuration-bootloader - (operating-system-bootloader os)) - #:disk-image-size disk-image-size - #:disk-image-format "raw" - #:file-system-type file-system-type - #:file-system-label root-label - #:file-system-uuid uuid - #:copy-inputs? #t - #:inputs `(("system" ,os) - ("bootcfg" ,bootcfg)) - #:substitutable? substitutable?)))) + (qemu-image #:name name + #:os os + #:bootcfg-drv bootcfg + #:bootloader (bootloader-configuration-bootloader + (operating-system-bootloader os)) + #:disk-image-size disk-image-size + #:disk-image-format "raw" + #:file-system-type file-system-type + #:file-system-label root-label + #:file-system-uuid uuid + #:copy-inputs? #t + #:inputs `(("system" ,os) + ("bootcfg" ,bootcfg)) + #:substitutable? substitutable?))) (define* (system-qemu-image os #:key