From patchwork Tue Jun 13 10:53:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 50877 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 411DD27BBE2; Tue, 13 Jun 2023 12:38:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F1D2627BBE2 for ; Tue, 13 Jun 2023 12:38:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q91f5-0003vt-Pz; Tue, 13 Jun 2023 06:54:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q91f0-0003vP-HW for guix-patches@gnu.org; Tue, 13 Jun 2023 06:54:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q91f0-0001AO-7x for guix-patches@gnu.org; Tue, 13 Jun 2023 06:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q91f0-0006gj-42 for guix-patches@gnu.org; Tue, 13 Jun 2023 06:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64042] [PATCH] gnu: image: Build partitions with only necessary inputs. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Jun 2023 10:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64042 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64042@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168665362325684 (code B ref -1); Tue, 13 Jun 2023 10:54:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jun 2023 10:53:43 +0000 Received: from localhost ([127.0.0.1]:41430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q91eh-0006gB-EB for submit@debbugs.gnu.org; Tue, 13 Jun 2023 06:53:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:47440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q91ed-0006g1-Vg for submit@debbugs.gnu.org; Tue, 13 Jun 2023 06:53:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q91ed-0003t6-Pb for guix-patches@gnu.org; Tue, 13 Jun 2023 06:53:39 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q91eY-00017I-TB for guix-patches@gnu.org; Tue, 13 Jun 2023 06:53:39 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-307d58b3efbso3593282f8f.0 for ; Tue, 13 Jun 2023 03:53:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686653610; x=1689245610; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=yPxwZQc+M+ihNDpiSeajWRLg+91M4JDf2C5CUa5R14U=; b=CSD/ye/4Rkes6K0+5bNP8E4R4GNYpz+SGmb7PP5NQSd9oREv4Y0WrDkmzHcJr9vKhF 3ZY2lwG2/o/SLue1TBaL93soS5Io5qH4N6H+Y1ydIAt9v3ifnb0KgHC0UXTMcdzysJkc ZeJAHAr9hCG4OVkOG1cI3++1mxVhJt57MnlLa/NuVViPlWBPMVS24nI9SmjUwKHMuk41 3VJ7rFKuGXuinTldeA2QliUe4sfWP3s8uhvBdAnMiddgUBOCxw01huWCyO9gLF7ql7WU drvWv666j2ctGVCaHEXVgcLJ12KqU4H3ivFeafg2hlv1FDF87aLjxfG2Wi7pE/hxz0dx ldaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686653610; x=1689245610; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yPxwZQc+M+ihNDpiSeajWRLg+91M4JDf2C5CUa5R14U=; b=IDpSObTok/w2OQyD17dLPbH1e+pVvRUqTAhA8XrswYlYG/C+VdipiIvXTGHuqqd4Iw DbaLMh4HLM95JB0kYjcHekLdKIxp8evNZ0TJwo1d8a5P3f2IEr8BdgIgl4wMA9hrZBiS x9C3uszj8oHBiwsNrSIuNaT7DmR/DFamtjKIzFaYhroN0u7fXByEsrbEypKVJtNUxc9O VI1e2GBtFUgo6VNWg/Bw0iRwuoBY5cVvA2A+S2/CuP8LgnDovvdo3lq1+ZRmZajEozCa KrftgodcCrse+RK5NYvXerOgEQQbUiNeKP6rWPU2D6X5v0qLrRbR6d6JJ2NIileqeEZQ eAKQ== X-Gm-Message-State: AC+VfDzg5+kvE0W2E2PLu6//MY6CN3/ciQ7oh1xbYFD8oX8RVN7yiYjC Ak7G7HtmJdHPq5NjZFnBadMJY5mmdyqAsw== X-Google-Smtp-Source: ACHHUZ5CWYrxe7ZAPaujNigt8WTZII0LKCfLhc1L7PSgJ/xxYRuj8wMZ+Umq/dJLkzpbuvG4mlbArQ== X-Received: by 2002:adf:ea50:0:b0:30f:c7f1:30e9 with SMTP id j16-20020adfea50000000b0030fc7f130e9mr2229049wrn.5.1686653609600; Tue, 13 Jun 2023 03:53:29 -0700 (PDT) Received: from localhost ([37.46.46.3]) by smtp.gmail.com with ESMTPSA id r15-20020adfda4f000000b002fe96f0b3acsm15141333wrl.63.2023.06.13.03.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jun 2023 03:53:29 -0700 (PDT) From: Efraim Flashner Date: Tue, 13 Jun 2023 13:53:20 +0300 Message-Id: <016f8f819184b8fb3395ee551f39a856c347fa38.1686653575.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=efraim.flashner@gmail.com; helo=mail-wr1-x431.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/system/image.scm (system-disk-image)[partition-image]: Adjust the inputs used by the image-builder to only use the packages necessary to build that partition. --- gnu/system/image.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) base-commit: b188c41d930dbe8142c1f377d3c8f2580ff1277c prerequisite-patch-id: 2ed36a7d0b049eb3bad8e16c2c167735bc8fbee1 prerequisite-patch-id: 68db7897e7d9cdcb940175892e8f5b0637a27cb1 prerequisite-patch-id: 830b043d4bee7ea66530e11972e65ad390b89ece prerequisite-patch-id: 55858a370c68c4b64ccadd34a3e03e22bfb3cc7d prerequisite-patch-id: bc9f36d509bee03fcbc238acb6ba722c32e5f7aa prerequisite-patch-id: b8b557edd1da6a6347928d5b6fe9728f71e69d58 diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 958ba5cbb2..81346495c2 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -418,7 +418,14 @@ (define* (system-disk-image image (with-imported-modules* (let ((initializer (or #$(partition-initializer partition) initialize-root-partition)) - (inputs '#+(list e2fsprogs fakeroot dosfstools mtools)) + (inputs '#+(cond + ((string-prefix? "ext" type) + (list e2fsprogs fakeroot)) + ((or (string=? type "vfat") + (string-prefix? "fat" type)) + (list dosfstools fakeroot mtools)) + (else + '()))) (image-root "tmp-root")) (sql-schema #$schema)