me/guix
Archived
1
0
Fork 0
Code Activity

gnu: genimage: Update to 14-1.11bb044.

Browse source 
Update to commit 11bb04455 to integrate fixes related to new genext2fs and
e2fsprogs versions.

* gnu/packages/genimage.scm (genimage): Update to 14-1.11bb044.
[arguments]{fix-failing-tests}: Update it.
* gnu/packages/patches/genimage-mke2fs-test.patch: Update it.
This commit is contained in:
Mathieu Othacehe 2021-11-21 11:22:45 +00:00
parent e74bcbc64f
commit 72501a555e
No known key found for this signature in database
GPG key ID: 8354763531769CA6
2 changed files with 98 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/genimage.scm
View file

@ -41,18 +41,20 @@
#:use-module (gnu packages virtualization)) #:use-module (gnu packages virtualization))
(define-public genimage (define-public genimage
(let ((commit "11bb04455eaf5434f0723c91a2224918ebd0a196")
(revision "1"))
(package (package
(name "genimage") (name "genimage")
(version "14") (version (git-version "14" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/pengutronix/genimage") (url "https://github.com/pengutronix/genimage")
(commit (string-append "v" version)))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1l45djpbaffhyw0allq3mgzwrdilk05iyj0nvp8l3s47vnp5bnbs")) "1dq3lk0awk12v2aidry35gvrci5a3nr6rzcq0j9hyyf0w1z1rn0l"))
(patches (patches
(search-patches "genimage-mke2fs-test.patch")))) (search-patches "genimage-mke2fs-test.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -90,11 +92,11 @@
(lambda _ (lambda _
;; We don't have /etc/passwd so uid 0 is not known as "root". ;; We don't have /etc/passwd so uid 0 is not known as "root".
;; Thus patch it out. ;; Thus patch it out.
(substitute* '("test/ext2test.dump" (substitute* '("test/ext2test.0.dump"
"test/ext3test.dump" "test/ext3test.0.dump"
"test/ext4test.dump" "test/ext4test.0.dump"
"test/ext2test-percent.dump" "test/ext2test-percent.0.dump"
"test/mke2fs.dump") "test/mke2fs.0.dump")
(("root") "unknown")))) (("root") "unknown"))))
(add-before 'check 'setenv-check (add-before 'check 'setenv-check
(lambda _ (lambda _
@ -133,4 +135,4 @@
(description "@command{genimage} creates Flash images according to a (description "@command{genimage} creates Flash images according to a
specification file.") specification file.")
(home-page "https://github.com/pengutronix/genimage") (home-page "https://github.com/pengutronix/genimage")
(license license:gpl2))) (license license:gpl2))))

10
gnu/packages/patches/genimage-mke2fs-test.patch
View file

@ -1,8 +1,8 @@
diff --git a/test/mke2fs.dump b/test/mke2fs.dump diff --git a/test/mke2fs.dump b/test/mke2fs.dump
index 8e63662..0c25798 100644 index 8e63662..0c25798 100644
--- a/test/mke2fs.dump --- a/test/mke2fs.0.dump
+++ b/test/mke2fs.dump +++ b/test/mke2fs.0.dump
@@ -11,7 +11,7 @@ Filesystem OS type: Linux @@ -11,7 +11,7 @@
Inode count: 8192 Inode count: 8192
Block count: 32768 Block count: 32768
Reserved block count: 1638 Reserved block count: 1638
@ -11,7 +11,7 @@ index 8e63662..0c25798 100644
Free inodes: 8141 Free inodes: 8141
First block: 1 First block: 1
Block size: 1024 Block size: 1024
@@ -29,7 +29,7 @@ Mount count: 0 @@ -29,7 +29,7 @@
Maximum mount count: -1 Maximum mount count: -1
Last checked: Sat Jan 1 00:00:00 2000 Last checked: Sat Jan 1 00:00:00 2000
Check interval: 0 (<none>) Check interval: 0 (<none>)
@ -20,7 +20,7 @@ index 8e63662..0c25798 100644
Reserved blocks uid: 0 (user root) Reserved blocks uid: 0 (user root)
Reserved blocks gid: 0 (group root) Reserved blocks gid: 0 (group root)
First inode: 11 First inode: 11
@@ -49,13 +49,13 @@ Journal sequence: 0x00000001 @@ -51,13 +51,13 @@
Journal start: 0 Journal start: 0