From 2900031f42ba85bebeffdb67a56b0b9cf92019e7 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 1 Jun 2022 15:00:44 -0700 Subject: [PATCH] gnu: diffoscope: Fix comparison of vmlinux files. * gnu/packages/diffoscope.scm (diffoscope)[arguments]: Add 'install-extract-vmlinux phase. [inputs]: Add python. --- gnu/packages/diffoscope.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index de0ace0107..1f0c905563 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -53,6 +53,7 @@ (define-module (gnu packages diffoscope) #:use-module (gnu packages pascal) #:use-module (gnu packages patchutils) #:use-module (gnu packages pdf) + #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sqlite) @@ -136,12 +137,25 @@ (define-public diffoscope (lambda _ ;; This requires /sbin to be in $PATH. (delete-file "tests/test_tools.py"))) + (add-after 'install 'install-extract-vmlinux + (lambda* (#:key outputs #:allow-other-keys) + ;; Work around bug comparing vmlinux files + ;; https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/305 + (let* ((scriptdir (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages/scripts/"))) + (mkdir-p scriptdir) + (copy-file "scripts/extract-vmlinux" + (string-append scriptdir "/extract-vmlinux"))))) (add-after 'install 'install-man-page (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (man (string-append out "/share/man/man1"))) (install-file "doc/diffoscope.1" man))))))) (inputs (list rpm ;for rpm-python + python python-debian python-libarchive-c python-magic