ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: genimage: Update to version 18.

Browse source 
* gnu/packages/genimage.scm (genimage): Update from 15 to 18.
[arguments]: Disable some tests.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Herman Rimm 2024-09-10 20:04:14 +02:00 committed by Ludovic Courtès
parent 0594985555
commit b21118a2df
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
gnu/packages/genimage.scm
View file

@ -41,27 +41,26 @@ (define-module (gnu packages genimage)
#:use-module (gnu packages virtualization)) #:use-module (gnu packages virtualization))
(define-public genimage (define-public genimage
(let ((commit "ec44ae086c705e6f0439e742c5a2e9b8f3d6ca82") (let ((commit "00009af6e29cfd46909bc8b4180147dda9f82ba8")
(revision "1")) (revision "0"))
(package (package
(name "genimage") (name "genimage")
(version (git-version "15" revision commit)) (version (git-version "18" revision commit))
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/pengutronix/genimage") (uri (git-reference
(commit commit))) (url "https://github.com/pengutronix/genimage")
(file-name (git-file-name name version)) (commit commit)))
(sha256 (file-name (git-file-name name version))
(base32 (sha256
"0amj2vjff58yna6kq959i2gqmbjywqr8j5kr5pjqsvbqam3vgg0r")) (base32
(patches "1mijyq79cb0yj4jm9ln9smpddq1f6r8cnsa568qca0krcv0p3zag"))))
(search-patches "genimage-mke2fs-test.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules `(#:modules
((ice-9 match) ((ice-9 match)
,@%default-gnu-modules) ,@%gnu-build-system-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'guixify (add-after 'unpack 'guixify
@ -70,8 +69,8 @@ (define-public genimage
((input directory regexp) ((input directory regexp)
(substitute* "config.c" (substitute* "config.c"
(((format #f "\\.def = \"(~a)\"" regexp) _ command) (((format #f "\\.def = \"(~a)\"" regexp) _ command)
(format #f ".def = \"~a/~a/~a\"" (string-append ".def = \"" (assoc-ref inputs input)
(assoc-ref inputs input) directory command))))) "/" directory "/" command "\"")))))
'(("cpio" "bin" "cpio") '(("cpio" "bin" "cpio")
("coreutils" "bin" "dd") ("coreutils" "bin" "dd")
("e2fsprogs" "sbin" "debugfs|e2fsck|mke2fs|tune2fs") ("e2fsprogs" "sbin" "debugfs|e2fsck|mke2fs|tune2fs")
@ -81,26 +80,36 @@ (define-public genimage
;; mkcramfs is obsolete. ;; mkcramfs is obsolete.
("dosfstools" "sbin" "mkdosfs") ("dosfstools" "sbin" "mkdosfs")
("mtd-utils" "sbin" "mkfs.(jffs2|ubifs)|ubinize") ("mtd-utils" "sbin" "mkfs.(jffs2|ubifs)|ubinize")
("f2fs-tools" "sbin" "(mkfs|sload).f2fs")
("squashfs-tools" "bin" "mksquashfs") ("squashfs-tools" "bin" "mksquashfs")
("qemu" "bin" "qemu-img") ("qemu" "bin" "qemu-img")
;; rauc and fiptool are unsupported.
("tar" "bin" "tar") ("tar" "bin" "tar")
("u-boot-tools" "bin" "mkimage"))) ("u-boot-tools" "bin" "mkimage")))
(substitute* "util.c" (substitute* "util.c"
(("\"/bin/sh\"") (("\"/bin/sh\"")
(string-append "\"" (assoc-ref inputs "bash") "/bin/sh\""))))) (string-append "\"" (assoc-ref inputs "bash") "/bin/sh\"")))))
(add-before 'check 'disable-failing-tests
(lambda _
;; We don't have /etc/passwd so uid 0 is not known as "root".
;; Thus patch it out.
(substitute* '("test/flash.test")
(("test_expect_success \"flash\"")
"test_expect_fail \"flash\""))
(substitute* '("test/hdimage.test")
(("test_expect_success fdisk,sfdisk \"hdimage\"")
"test_expect_fail fdisk,sfdisk \"hdimage\"")
(("test_expect_success hexdump \"hdimage no-partition\"")
"test_expect_fail hexdump \"hdimage no-partition\""))))
(add-before 'check 'fix-failing-tests (add-before 'check 'fix-failing-tests
(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.0.dump" (substitute* '("test/ext2test.2.dump"
"test/ext2test.1.dump" "test/ext3test.2.dump"
"test/ext3test.0.dump" "test/ext4test.2.dump"
"test/ext3test.1.dump" "test/ext2test-percent.2.dump"
"test/ext4test.0.dump" "test/mke2fs.2.dump")
"test/ext4test.1.dump"
"test/ext2test-percent.0.dump"
"test/ext2test-percent.1.dump"
"test/mke2fs.0.dump")
(("root") "unknown")))) (("root") "unknown"))))
(add-before 'check 'setenv-check (add-before 'check 'setenv-check
(lambda _ (lambda _
@ -127,6 +136,7 @@ (define-public genimage
("coreutils" ,coreutils) ; chmod, dd ("coreutils" ,coreutils) ; chmod, dd
("dosfstools" ,dosfstools) ("dosfstools" ,dosfstools)
("e2fsprogs" ,e2fsprogs) ("e2fsprogs" ,e2fsprogs)
("f2fs-tools" ,f2fs-tools)
("genext2fs" ,genext2fs) ("genext2fs" ,genext2fs)
("libconfuse" ,libconfuse) ("libconfuse" ,libconfuse)
("mtd-utils" ,mtd-utils) ("mtd-utils" ,mtd-utils)