[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/16: image: 'register-closure' leaves it up to the caller to deduplica
From: |
guix-commits |
Subject: |
09/16: image: 'register-closure' leaves it up to the caller to deduplicate. |
Date: |
Tue, 15 Dec 2020 11:33:00 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 2aa512ec2843991804b5bf345c80abdb2b993bdc
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Dec 10 21:25:39 2020 +0100
image: 'register-closure' leaves it up to the caller to deduplicate.
* 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 8f50f27..8d5fc60 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 03be569..8c6ab64 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)))
- 01/16: Revert "gnu: grub: Fix unicode font loading when booting over TFTP.", (continued)
- 01/16: Revert "gnu: grub: Fix unicode font loading when booting over TFTP.", guix-commits, 2020/12/15
- 03/16: serialization: 'restore-file' sets canonical timestamp and permissions., guix-commits, 2020/12/15
- 07/16: database: Remove #:reset-timestamps? from 'register-items'., guix-commits, 2020/12/15
- 10/16: database: Remove #:deduplicate? from 'register-items'., guix-commits, 2020/12/15
- 06/16: image: 'register-closure' assumes already-reset timestamps., guix-commits, 2020/12/15
- 12/16: database: Remove #:deduplicate? and #:reset-timestamps? from 'register-path'., guix-commits, 2020/12/15
- 08/16: store-copy: 'populate-store' can optionally deduplicate files., guix-commits, 2020/12/15
- 04/16: nar: Deduplicate files right as they are restored., guix-commits, 2020/12/15
- 16/16: deduplicate: Create the '.links' directory lazily., guix-commits, 2020/12/15
- 05/16: store-copy: 'populate-store' resets timestamps., guix-commits, 2020/12/15
- 09/16: image: 'register-closure' leaves it up to the caller to deduplicate.,
guix-commits <=
- 15/16: database: Honor 'SOURCE_DATE_EPOCH'., guix-commits, 2020/12/15
- 13/16: system: 'init' does not recompute the hash of each store item., guix-commits, 2020/12/15
- 14/16: database: Remove 'register-path'., guix-commits, 2020/12/15
- 11/16: guix system: 'init' copies, resets timestamps, and deduplicates at once., guix-commits, 2020/12/15