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 oGuWHP2L01+EBwAA0tVLHw (envelope-from ) for ; Fri, 11 Dec 2020 15:10:53 +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 +Dg+GP2L01/gGAAAbx9fmQ (envelope-from ) for ; Fri, 11 Dec 2020 15:10:53 +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 3B81A940367 for ; Fri, 11 Dec 2020 15:10:53 +0000 (UTC) Received: from localhost ([::1]:60840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knk4K-0005BI-4T for larch@yhetil.org; Fri, 11 Dec 2020 10:10:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knk3Z-0004M2-Cw for bug-guix@gnu.org; Fri, 11 Dec 2020 10:10:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59280) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1knk3Z-0000eC-4v for bug-guix@gnu.org; Fri, 11 Dec 2020 10:10:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1knk3Z-0007k6-0R for bug-guix@gnu.org; Fri, 11 Dec 2020 10:10:05 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#44760: [PATCH 08/15] image: 'register-closure' leaves it up to the caller to deduplicate. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 11 Dec 2020 15:10:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44760 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 44760@debbugs.gnu.org Received: via spool by 44760-submit@debbugs.gnu.org id=B44760.160769939529679 (code B ref 44760); Fri, 11 Dec 2020 15:10:04 +0000 Received: (at 44760) by debbugs.gnu.org; 11 Dec 2020 15:09:55 +0000 Received: from localhost ([127.0.0.1]:42583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knk3P-0007iW-5F for submit@debbugs.gnu.org; Fri, 11 Dec 2020 10:09:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knk3G-0007h0-CC for 44760@debbugs.gnu.org; Fri, 11 Dec 2020 10:09:47 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47536) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knk3B-0000V2-8p; Fri, 11 Dec 2020 10:09:41 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59324 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1knk3A-0004Tz-PL; Fri, 11 Dec 2020 10:09:41 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 11 Dec 2020 16:09:18 +0100 Message-Id: <20201211150919.18435-9-ludo@gnu.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211150919.18435-1-ludo@gnu.org> References: <87h7pkffzy.fsf@inria.fr> <20201211150919.18435-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.20 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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-Migadu-Queue-Id: 3B81A940367 X-Spam-Score: 2.20 X-Migadu-Scanner: scn1.migadu.com X-TUID: X7r8JHzkbdAH * gnu/build/image.scm (register-closure): Remove #:deduplicate? parameter and pass #:deduplicate? #f to 'register-items'. (initialize-root-partition): Adjust accordingly. * gnu/build/vm.scm (register-closure, root-partition-initializer): Likewise. --- gnu/build/image.scm | 8 ++------ gnu/build/vm.scm | 9 +++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 8f50f27f78..8d5fc603d9 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -140,21 +140,18 @@ given CONFIG file." (define* (register-closure prefix closure #:key - (deduplicate? #t) (schema (sql-schema)) (wal-mode? #t)) "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 DEDUPLICATE? is true, -deduplicates files common to CLOSURE and the rest of PREFIX. Pass WAL-MODE? -to call-with-database." +produced by #:references-graphs. Pass WAL-MODE? to call-with-database." (let ((items (call-with-input-file closure read-reference-graph))) (parameterize ((sql-schema schema)) (with-database (store-database-file #:prefix prefix) db #:wal-mode? wal-mode? (register-items db items #:prefix prefix - #:deduplicate? deduplicate? + #:deduplicate? #f #:registration-time %epoch))))) (define* (initialize-efi-partition root @@ -196,7 +193,6 @@ register-closure." (when register-closures? (for-each (lambda (closure) (register-closure root closure - #:deduplicate? #f #:wal-mode? wal-mode?)) references-graphs)) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 03be5697b7..8c6ab648ac 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -215,18 +215,16 @@ the #:references-graphs parameter of 'derivation'." (define* (register-closure prefix closure #:key - (deduplicate? #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 DEDUPLICATE? is true, -deduplicates files common to CLOSURE and the rest of PREFIX." +produced by #:references-graphs." (let ((items (call-with-input-file closure read-reference-graph))) (parameterize ((sql-schema schema)) (with-database (store-database-file #:prefix prefix) db (register-items db items #:prefix prefix - #:deduplicate? deduplicate? + #:deduplicate? #f #:registration-time %epoch))))) @@ -412,8 +410,7 @@ system that is passed to 'populate-root-file-system'." (display "registering closures...\n") (for-each (lambda (closure) (register-closure target - (string-append "/xchg/" closure) - #:deduplicate? #f)) + (string-append "/xchg/" closure))) closures) (unless copy-closures? (umount target-store))) -- 2.29.2