From 2b9ce1007df59820d33c806d5feec04a38d59165 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:17:16 +0200 Subject: gnu: nvme-cli: Fix cross-compilation. * gnu/packages/linux.scm (nvme-cli)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0a154fd6cc..4acd50879e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3859,15 +3859,17 @@ Translation (@dfn{SAT}) are also supported.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "CC=gcc") + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases - (delete 'configure) ; No ./configure script + (delete 'configure) ; no ./configure script (replace 'install (lambda _ (invoke "make" "install-spec" "PREFIX=" (string-append "DESTDIR=" %output))))) - #:tests? #f)) ; The tests require sysfs, which is not accessible from - ; the build environment + ;; The tests require sysfs, which is not accessible from from the build + ;; environment + #:tests? #f)) (synopsis "NVM-Express user space tooling for Linux") (description "Nvme-cli is a utility to provide standards compliant tooling for NVM-Express drives. It was made specifically for Linux as it relies on the -- cgit v1.2.3 From 1f0e1c49aa83d5d180f4f5ee945085eeb2d62191 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:26:13 +0200 Subject: gnu: i2c-tools: Actually cross-compile. * gnu/packages/linux.scm (i2c-tools)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4acd50879e..1466165aa3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3595,10 +3595,10 @@ create a firmware image suitable for the Linux kernel, and more.") "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no 'check' target + `(#:tests? #f ; no 'check' target #:make-flags (list (string-append "prefix=" %output) - "CC=gcc") - ;; no configure script + ,(string-append "CC=" (cc-for-target))) + ;; No configure script. #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("perl" ,perl))) -- cgit v1.2.3 From 15c8b1723a4819e3bac024690cde3fac275be2dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:28:17 +0200 Subject: gnu: earlyoom: Actually cross-compile. * gnu/packages/linux.scm (earlyoom)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1466165aa3..1a1821b5a7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3007,7 +3007,7 @@ from the module-init-tools project.") (install-file "contrib/notify_all_users.py" contrib) #t)))) #:make-flags (let* ((prefix (assoc-ref %outputs "out"))) - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) (string-append "VERSION=v" ,version) (string-append "PREFIX=" prefix) (string-append "SYSCONFDIR=" prefix "/etc"))) -- cgit v1.2.3 From e45f0c79fbad86a9a181b8674219f385c8ea5504 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:31:27 +0200 Subject: gnu: mbpfan: Fix cross-compilation. * gnu/packages/linux.scm (mbpfan)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1a1821b5a7..e60cc790e2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6490,10 +6490,10 @@ interface to this kernel feature.") (base32 "0aijyxrqh01x0s80yr4cgxgd001iiqqph65pxvby7f0wz8lnxnqj")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; tests ask to be run as root + `(#:tests? #f ; tests ask to be run as root #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "DESTDIR=" out) - "CC=gcc")) + ,(string-append "CC=" (cc-for-target)))) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths -- cgit v1.2.3 From 7dd57cc00e949dd414ed1c820d6452b2c9978184 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:38:11 +0200 Subject: gnu: hdparm: Fix cross-compilation. * gnu/packages/linux.scm (hdparm)[arguments]: Use CC-FOR-TARGET. Don't strip the binary during the build phase. --- gnu/packages/linux.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e60cc790e2..30420b013b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3821,10 +3821,13 @@ isolation or root privileges.") "03z1qm8zbgpxagk3994lvp24yqsshjibkwg05v9p3q1w7y48xrws")))) (build-system gnu-build-system) (arguments - `(#:make-flags (let ((out (assoc-ref %outputs "out"))) - (list (string-append "binprefix=" out) - (string-append "manprefix=" out) - "CC=gcc")) + `(#:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "binprefix=" out) + (string-append "manprefix=" out) + ,(string-append "CC=" (cc-for-target)) + ;; Let Guix strip the binaries and not break cross-compilation. + "STRIP=true")) #:phases (modify-phases %standard-phases (delete 'configure)) ; no configure script -- cgit v1.2.3 From 3dec317f1d54855705fb08c156f758b194c52d5c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:42:43 +0200 Subject: gnu: mdadm: Actually cross-compile. * gnu/packages/linux.scm (mdadm)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 30420b013b..197e5ea85a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4112,7 +4112,7 @@ MPEG-2 and audio over Linux IEEE 1394.") `(("udev" ,eudev))) (arguments `(#:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) "INSTALL=install" "CHECK_RUN_DIR=0" ;; TODO: tell it where to find 'sendmail' -- cgit v1.2.3 From ac68ab337cf09c99a71393002854f66ad495d2ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:47:22 +0200 Subject: gnu: blktrace: Prepare for cross-compilation. * gnu/packages/linux.scm (blktrace)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 197e5ea85a..1e1ba787e2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4331,12 +4331,13 @@ applications.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:make-flags - (list "CC=gcc" (string-append "prefix=" %output)) - #:tests? #f ; no tests + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target)) + (string-append "prefix=" %output)) + #:tests? #f ; no tests #:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script + (delete 'configure) ; no configure script (add-after 'unpack 'fix-gnuplot-path (lambda* (#:key inputs #:allow-other-keys) (let ((gnuplot (assoc-ref inputs "gnuplot"))) -- cgit v1.2.3 From 898e8b528b6bde0a699cac81532181050344a548 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 21:31:11 +0200 Subject: gnu: net-tools: Fix cross-compilation. * gnu/packages/linux.scm (net-tools)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1e1ba787e2..12c37d8c51 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2150,7 +2150,7 @@ inadequately in modern network environments, and both should be deprecated.") (home-page "http://net-tools.sourceforge.net/") (build-system gnu-build-system) (arguments - '(#:modules ((guix build gnu-build-system) + `(#:modules ((guix build gnu-build-system) (guix build utils) (srfi srfi-1) (srfi srfi-26)) @@ -2190,7 +2190,7 @@ inadequately in modern network environments, and both should be deprecated.") #:tests? #f ; no test suite #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) (string-append "BASEDIR=" out) (string-append "INSTALLNLSDIR=" out "/share/locale") (string-append "mandir=/share/man"))))) -- cgit v1.2.3 From 56a9ef22e3044134844f0093e2a3905f73dd830f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 21:41:32 +0200 Subject: gnu: iw: Use CC-FOR-TARGET. * gnu/packages/linux.scm (iw)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 12c37d8c51..0a935d529d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2414,12 +2414,11 @@ configuration and monitoring interfaces.") (arguments `(#:make-flags (let* ((target ,(%current-target-system)) - (gcc (if target (string-append target "-gcc") "gcc")) (pkg-config (if target (string-append target "-pkg-config") "pkg-config"))) (list - (string-append "CC=" gcc) + ,(string-append "CC=" (cc-for-target)) (string-append "PKG_CONFIG=" (assoc-ref %build-inputs "pkg-config") "/bin/" pkg-config) -- cgit v1.2.3 From 6b8ad47b2afb2b017a4f44471fc460795719d0d7 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:45:05 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.226. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.226. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0a935d529d..efd02b9902 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,10 +409,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.225") +(define-public linux-libre-4.4-version "4.4.226") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0pn66hf9yrjg15skq1inscr5m0slvgsd2qm8rg5id70llrb4jis9"))) + (hash (base32 "1dwvm81i62b06jsl38spfn719zrsbwq5z8viwckrpw4ma4w9k0j1"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From c77b62ca5cc02cef0ee4a324645e843a9c528e75 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:46:02 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.226. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.226. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index efd02b9902..23d58beb79 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -401,10 +401,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.225") +(define-public linux-libre-4.9-version "4.9.226") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1s63aymgsc4lsysy9d972ps9cyrf6bncyy5wcpv5a3wbaj678iz5"))) + (hash (base32 "1jj5ydz5cy87z7hrv54bkyl9739lpzja8580ngjhrip5iwb8q2j6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From f2a65479becef076584888d535bcc471a557f7aa Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:46:30 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.183. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.183. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 23d58beb79..bdc8ef9761 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -393,10 +393,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.182") +(define-public linux-libre-4.14-version "4.14.183") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "142v7qnfska86jqzilwq00kxdrq08iaaaw7f47xp9bnhb8fiy7b7"))) + (hash (base32 "11c0vd2pwplm8wafich4zg2mnp10vvnap987c5jh96w1avpsyra2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 644690b3e2d3bcb565ce796b096bb05d6944d690 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:47:09 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.126. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.126. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bdc8ef9761..e86baed959 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -385,10 +385,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.125") +(define-public linux-libre-4.19-version "4.19.126") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0zmxs6q2rgssvsh76xq9xgcax7bps19x2448d1q1fj9pzc7g8hwq"))) + (hash (base32 "129ziwvk3f4xh8jvnq2krajc0bnrl2zxffqsiz63j7p3vc57wakf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From f52504a92c45545a754df7af5e952ba141e3b367 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:47:44 -0400 Subject: gnu: linux-libre@5.6: Update to 5.6.16. * gnu/packages/linux.scm (linux-libre-5.6-version): Update to 5.6.16. (linux-libre-5.6-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e86baed959..9beb764a39 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,10 +369,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.6-version "5.6.15") +(define-public linux-libre-5.6-version "5.6.16") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) - (hash (base32 "0kh34f9vdfsi9g83fa1i1926djyzfi466w02c4y4d46ljf9pkav5"))) + (hash (base32 "1xvwk6yxi5nhiwhskpmr89a31286mw9hpm0y3l3i5ydswx6lnl15"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.6))) -- cgit v1.2.3 From 3daf7bc169561eadf986ca4477549c562c65b9ff Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:48:20 -0400 Subject: gnu: linux-libre: Update to 5.4.44. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.44. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9beb764a39..35b4d73b51 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -377,10 +377,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.6))) -(define-public linux-libre-5.4-version "5.4.43") +(define-public linux-libre-5.4-version "5.4.44") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0i07g72138xdf1l8x593jndq0waf3fx7plz3m6n5f9fl885bjrr6"))) + (hash (base32 "0fc4nsv1zwlknvfv1bzkjlq2vlx28wfl09hg2p7r8cn7a77bphlp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From f0bebc570614dbe052edca956f7bab2c593379ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2020 19:05:51 +0200 Subject: gnu: iproute2: Update to 5.7.0. * gnu/packages/linux.scm (iproute): Update to 5.7.0. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 35b4d73b51..f61ce864af 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2072,7 +2072,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") (define-public iproute (package (name "iproute2") - (version "5.5.0") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append @@ -2080,7 +2080,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") version ".tar.xz")) (sha256 (base32 - "0ywg70f98wgfai35jl47xzpjp45a6n7crja4vc8ql85cbi1l7ids")))) + "088gs56iqhdlpw1iqjwrss4zxd4zbl2wl8s2implrrdajjxcfpbj")))) (build-system gnu-build-system) (arguments `( ;; There is a test suite, but it wants network namespaces and sudo. -- cgit v1.2.3 From 53428597a690b409cdb66070ca4397ed76015e20 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 18:02:03 +0200 Subject: gnu: strace: Update to 5.7. * gnu/packages/linux.scm (strace): Update to 5.7. [arguments]: Disable three failing tests. --- gnu/packages/linux.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f61ce864af..745370b8f8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1788,7 +1788,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.") (define-public strace (package (name "strace") - (version "5.5") + (version "5.7") (home-page "https://strace.io") (source (origin (method url-fetch) @@ -1796,7 +1796,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.") "/strace-" version ".tar.xz")) (sha256 (base32 - "1zrhpzjlgfwfl8dd53llswmmharm5rbi0zch7lln5sjris69an4z")))) + "1n6cfz3i2krkyvxpdp3kmxhf7sy5xp0danzaiirbk5fdkfgvb15j")))) (build-system gnu-build-system) (arguments '(#:phases @@ -1805,6 +1805,12 @@ Zerofree requires the file system to be unmounted or mounted read-only.") (lambda _ (substitute* "strace.c" (("/bin/sh") (which "sh"))) + #t)) + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; XXX These hang forever even if the test time-out is extended. + (substitute* "tests/Makefile.in" + (("^\tstrace-DD?D?\\.test \\\\.*") "")) #t))) ;; Don't fail if the architecture doesn't support different personalities. #:configure-flags '("--enable-mpers=check") -- cgit v1.2.3 From df305cea48d769cc35e01a4d6d68f22d885520f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:24:00 +0200 Subject: gnu: mcelog: Fix unversioned DOCDIR. * gnu/packages/linux.scm (mcelog)[arguments]: VERSION DOCDIR. --- gnu/packages/linux.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 745370b8f8..9cc23609f1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5496,7 +5496,8 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.") #:make-flags (let ((out (assoc-ref %outputs "out"))) (list "CC=gcc" (string-append "prefix=" out) - (string-append "DOCDIR=" out "/share/doc/mcelog") + (string-append "DOCDIR=" out "/share/doc/" + ,name "-" ,version) "etcprefix=$(DOCDIR)/examples")) ;; The tests will only run as root on certain supported CPU models. #:tests? #f)) -- cgit v1.2.3 From ed139ee733db52c6f364d07bb4dc72385cfe8818 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:26:04 +0200 Subject: gnu: mcelog: Update to 170. * gnu/packages/linux.scm (mcelog): Update to 170. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9cc23609f1..a9a281858e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5472,14 +5472,14 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.") (define-public mcelog (package (name "mcelog") - (version "168") + (version "170") (source (origin (method url-fetch) (uri (string-append "https://git.kernel.org/cgit/utils/cpu/mce/" "mcelog.git/snapshot/v" version ".tar.gz")) (sha256 (base32 - "1c4faayg1gcm3002b2fdrfnv76z92mvfzccvx8w9crjp0d17sp24")) + "1m11v1y7cvpm7hwsghj23z77ps1w5jzn8000iwiyxpb939h2km5l")) (file-name (string-append name "-" version ".tar.gz")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From de3825286ff91529c66a4d3847518e5d7cd45295 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:29:42 +0200 Subject: gnu: mcelog: Update description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I believe that nowadays rasdaemon is a/the recommended alternative. * gnu/packages/linux.scm (mcelog)[description]: Remove ‘required’. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a9a281858e..db03160085 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5505,10 +5505,10 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.") (home-page "https://mcelog.org/") (synopsis "Machine check monitor for x86 Linux systems") (description - "The mcelog daemon is required by the Linux kernel to log memory, I/O, CPU, -and other hardware errors on x86 systems. It can also perform user-defined -tasks, such as bringing bad pages off-line, when configurable error thresholds -are exceeded.") + "The mcelog daemon logs memory, I/O, CPU, and other hardware errors on x86 +systems running the kernel Linux. It can also perform user-defined tasks, such +as bringing bad pages off-line, when configurable error thresholds are +exceeded.") (license license:gpl2))) (define-public mtd-utils -- cgit v1.2.3