From 63d4ef52ebad4157817d56ccbe974da8fff81929 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 19:49:27 +0100 Subject: gnu: Remove GCC < 7 workarounds. * gnu/packages/emulators.scm (dolphin-emu)[native-inputs]: Remove GCC-7. [arguments]: Adjust accordingly. * gnu/packages/games.scm (openrct2): Likewise. * gnu/packages/linux.scm (make-linux-libre): Likewise. * gnu/packages/mpd.scm (mpd): Likewise. * gnu/packages/storage.scm (ceph): Likewise. --- gnu/packages/linux.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d7c242015e..e71c62900f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -308,10 +308,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ("flex" ,flex) ("bison" ,bison) - ;; Build with GCC-7 for full retpoline support. - ;; FIXME: Remove this when our default compiler has retpoline support. - ("gcc" ,gcc-7) - ;; These are needed to compile the GCC plugins. ("gmp" ,gmp) ("mpfr" ,mpfr) @@ -338,11 +334,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (substitute* (find-files "." "^Makefile(\\.include)?$") (("/bin/pwd") "pwd")) #t)) - (add-before 'configure 'work-around-gcc-7-include-path-issue - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) (replace 'configure (lambda* (#:key inputs native-inputs target #:allow-other-keys) ;; Avoid introducing timestamps -- cgit v1.3 From f90d6c3f69d51f10a47e78c6d57d8e59a7da337e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 Feb 2019 20:20:28 +0100 Subject: gnu: efivar: Fix build failure with GCC7. * gnu/packages/linux.scm (efivar)[arguments]: Add phase 'kernel-headers-are-system-headers'. --- gnu/packages/linux.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 23dd3f1ebd..8dd8e947ed 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4104,7 +4104,14 @@ under OpenGL graphics workloads.") (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) #:phases (modify-phases %standard-phases - (delete 'configure)))) + (delete 'configure) + (add-before 'build 'kernel-headers-are-system-headers + (lambda* (#:key inputs #:allow-other-keys) + (let ((kernel-headers (assoc-ref inputs "kernel-headers"))) + ;; Make sure the kernel headers are treated as system headers + ;; to suppress a conflict between "util.h" and . + (setenv "C_INCLUDE_PATH" (string-append kernel-headers "/include")) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.3 From ceb831d33841d47f4b92c07829df9134853c83d0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 14:44:37 +0100 Subject: gnu: libcap: Update to 2.26. * gnu/packages/linux.scm (libcap): Update to 2.26. --- 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 8dd8e947ed..24234b431f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1381,7 +1381,7 @@ configuration (iptunnel, ipmaddr).") (define-public libcap (package (name "libcap") - (version "2.25") + (version "2.26") (source (origin (method url-fetch) (uri (string-append @@ -1389,7 +1389,7 @@ configuration (iptunnel, ipmaddr).") "libcap2/libcap-" version ".tar.xz")) (sha256 (base32 - "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39")))) + "12s5b8fp61jcn4qld8a7fakcz1han4a6l3b8cyl3n6r7hk2bfc5n")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.3 From b9a30e0d37525e714a232318c26c7e4ef8250dc1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 17:41:43 +0100 Subject: gnu: efibootmgr: Fix build failure with GCC7. * gnu/packages/linux.scm (efibootmgr)[arguments]: Set C_INCLUDE_PATH. --- gnu/packages/linux.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ed092e1c73..6049b09139 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4142,7 +4142,12 @@ interface to the variable facility of UEFI boot firmware.") ;; installed (known as OS_VENDOR in the code). ;; GRUB overrides this, as such it's only used if ;; nothing else is specified on the command line. - "EFIDIR=gnu") + "EFIDIR=gnu" + ;; Treat kernel headers as system headers to prevent + ;; warnings about conflicting types. + (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "kernel-headers") + "/include")) #:phases (modify-phases %standard-phases (delete 'configure)))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.3 From 520ae432d446010ed6a5233c8abfda88a945926c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Mar 2019 21:15:15 +0100 Subject: gnu: util-linux: Update to 2.33.1. * gnu/packages/linux.scm (util-linux): Update to 2.33.1. * gnu/packages/patches/util-linux-tests.patch: Skip one new test. --- gnu/packages/linux.scm | 4 ++-- gnu/packages/patches/util-linux-tests.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9020a599e2..674f6181da 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -600,7 +600,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.32.1") + (version "2.33.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -608,7 +608,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "1ck7d8srw5szpjq7v0gpmjahnjs6wgqzm311ki4gazww6xx71rl6")) + "08ggvgrb59m5jbq29950xxirsgv4xj3nwsc7vf82nyg1nvrxjjy1")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/util-linux-tests.patch b/gnu/packages/patches/util-linux-tests.patch index bb5be66515..ec1671f224 100644 --- a/gnu/packages/patches/util-linux-tests.patch +++ b/gnu/packages/patches/util-linux-tests.patch @@ -2,6 +2,8 @@ This test checks whether 'root' is successfully translated to UID/GID 0, using 'getpwnam' in libmount. This doesn't work in the chroot because /etc/passwd doesn't contain an entry for 'root' so skip it. +The second test requires that '/sys/dev/block' is present, which is not +the case inside the build container. --- util-linux-2.25.2/tests/ts/libmount/optstr 2015-01-23 13:58:41.181151194 +0100 +++ util-linux-2.25.2/tests/ts/libmount/optstr 2015-01-23 13:58:42.829161716 +0100 @@ -16,3 +18,14 @@ using 'getpwnam' in libmount. This doesn't work in the chroot because ts_init_subtest "deduplicate" ts_run $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=ccc,fff=eee AAA &> $TS_OUTPUT ts_finalize_subtest +--- a/tests/ts/lsblk/lsblk 2019-03-11 21:08:23.734387391 +0100 ++++ b/tests/ts/lsblk/lsblk 2019-03-11 21:12:43.635473111 +0100 +@@ -22,6 +22,8 @@ + + ts_init "$*" + ++ts_skip "/sys/dev/block is not available" ++ + ts_check_test_command "$TS_CMD_LSBLK" + ts_check_prog xz + ts_check_prog tar -- cgit v1.3 From 3d8f6577bf0ff68d5b73ca713d247319bdd30f03 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 15:33:10 +0200 Subject: gnu: util-linux: Update to 2.33.2. * gnu/packages/linux.scm (util-linux): Update to 2.33.2. --- 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 b39f45338f..68d022cffe 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -645,7 +645,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.33.1") + (version "2.33.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -653,7 +653,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "08ggvgrb59m5jbq29950xxirsgv4xj3nwsc7vf82nyg1nvrxjjy1")) + "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet -- cgit v1.3 From 4bf8500384fe29d511007444cb6edb7aeeba6c91 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 15 Jun 2019 15:14:06 +0200 Subject: gnu: libcap: Update to 2.27. * gnu/packages/linux.scm (libcap): Update to 2.27. --- 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 15473b06bd..eeb3a0a3e5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1537,7 +1537,7 @@ configuration (iptunnel, ipmaddr).") (define-public libcap (package (name "libcap") - (version "2.26") + (version "2.27") (source (origin (method url-fetch) (uri (string-append @@ -1545,7 +1545,7 @@ configuration (iptunnel, ipmaddr).") "libcap2/libcap-" version ".tar.xz")) (sha256 (base32 - "12s5b8fp61jcn4qld8a7fakcz1han4a6l3b8cyl3n6r7hk2bfc5n")))) + "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.3 From ac3842ef3e6ecdaa7a147cfe6ab59f017544a8a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 18:12:54 +0200 Subject: gnu: util-linux: Update to 2.34. * gnu/packages/linux.scm (util-linux): Update to 2.34. --- 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 e2cde4b693..f0fa6bba92 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -723,7 +723,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.33.2") + (version "2.34") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -731,7 +731,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3")) + "1db2kydkwjmvgd1glkcba3adhidxw0f1x735dcjdpdjjf869sgvl")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet -- cgit v1.3 From 1290855490baf03944dc85d8353c2b8cedac5256 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 1 Jul 2019 17:24:33 +0200 Subject: gnu: linux-libre-headers: Update to 4.19.56. * gnu/packages/linux.scm (linux-libre-headers-4.14.67): Rename to ... (linux-libre-headers-4.19.56): ... this. Adjust hash accordingly. (linux-libre-headers): Set to LINUX-LIBRE-HEADERS-4.19.56. * gnu/packages/commencement.scm (linux-libre-headers-boot0)[native-inputs]: Add FLEX-BOOT0 and BISON-BOOT0. --- gnu/packages/commencement.scm | 7 ++++++- gnu/packages/linux.scm | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8a0e1c3cb1..230b63364a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1710,6 +1710,7 @@ exec " gcc "/bin/" program (define bison-boot0 ;; This Bison is needed to build MiG so we need it early in the process. + ;; Recent versions of Linux-Libre headers also depend on this. (let* ((bison (package (inherit bison) (propagated-inputs `(("m4" ,m4))) (inputs '()) ;remove Flex... @@ -1735,7 +1736,7 @@ exec " gcc "/bin/" program (native-inputs `(("perl" ,perl-boot0)))))) (define flex-boot0 - ;; This Flex is needed to build MiG. + ;; This Flex is needed to build MiG as well as Linux-Libre headers. (let* ((flex (package (inherit flex) (native-inputs `(("bison" ,bison-boot0))) (propagated-inputs `(("m4" ,m4))) @@ -1760,6 +1761,10 @@ exec " gcc "/bin/" program ,@(package-arguments linux-libre-headers))) (native-inputs `(("perl" ,perl-boot0) + + ;; Flex and Bison are required since version 4.16. + ("flex" ,flex-boot0) + ("bison" ,bison-boot0) ,@(%boot0-inputs))))))) (define gnumach-headers-boot0 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f1fdcba311..7df83ca020 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -496,11 +496,11 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config-veyron #:extra-version "arm-veyron")) -(define-public linux-libre-headers-4.14.67 - (make-linux-libre-headers "4.14.67" - "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg")) +(define-public linux-libre-headers-4.19.56 + (make-linux-libre-headers "4.19.56" + "1zqiic55viy065lhnkmhn33sz3bbbr2ykbm5f92yzd8lpc9zl7yx")) -(define-public linux-libre-headers linux-libre-headers-4.14.67) +(define-public linux-libre-headers linux-libre-headers-4.19.56) (define-public linux-libre linux-libre-5.1) (define-public linux-libre-arm-generic -- cgit v1.3 From 344f358fba76f4ff576c2702819f3cfd7a6c5348 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 17:26:24 +0200 Subject: gnu: rdma-core: Update to 22.3. * gnu/packages/linux.scm (rdma-core): Update to 22.3. --- 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 5f2c86b21d..4ccf613a9b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3896,7 +3896,7 @@ The package provides additional NTFS tools.") (define-public rdma-core (package (name "rdma-core") - (version "14") + (version "22.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -3904,7 +3904,7 @@ The package provides additional NTFS tools.") version ".tar.gz")) (sha256 (base32 - "0w03zd49k96bmly44qc8l0s9l671sd26k4wrilsp13xaspy048kd")))) + "0jgp1xh328x0kr6lkn4vq71cc627zd05wczr74b3j3151flhj828")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no tests -- cgit v1.3 From 5247aab8d6a18a4081ab7caeddb4fc083bca1f6b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Jul 2019 15:12:50 +0200 Subject: gnu: multipath-tools: Treat libaio headers as system headers. * gnu/packages/linux.scm (multipath-tools)[arguments]: Set C_INCLUDE_PATH in <#:make-flags>. --- gnu/packages/linux.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4ccf613a9b..22f001d040 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3271,6 +3271,12 @@ arrays when needed.") (string-append "DESTDIR=" (assoc-ref %outputs "out")) "SYSTEMDPATH=lib" + ;; Add the libaio headers to GCCs system header + ;; search path to suppress -Werror=cast-qual on + ;; the included headers. + (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "libaio") + "/include") (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) -- cgit v1.3 From 0a6e9e13c54fb8a4574c9e1eb4e6d243f45b12ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Jul 2019 14:37:58 +0200 Subject: gnu: Remove workarounds for missing libarchive nettle propagation. * gnu/packages/gnome.scm (brasero, libgxps, aisleriot, grilo, grilo-plugins, totem, rhythmbox, gvfs, d-feet, gnome-session, gnome-autoar, tracker, nautilus)[inputs]: Remove NETTLE. * gnu/packages/linux.scm (singularity)[inputs]: Likewise. * gnu/packages/mate.scm (atril)[inputs]: Likewise. * gnu/packages/package-management.scm (rpm, libostree, flatpak)[inputs]: Likewise. --- gnu/packages/gnome.scm | 22 +++------------------- gnu/packages/linux.scm | 2 -- gnu/packages/mate.scm | 2 -- gnu/packages/package-management.scm | 4 ---- 4 files changed, 3 insertions(+), 27 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e8c26f5370..e2ecc1bb6a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -223,7 +223,6 @@ ("libnotify" ,libnotify) ("libsm" ,libsm) ("libxml2" ,libxml2) - ("nettle" ,nettle) ("totem-pl-parser" ,totem-pl-parser))) (home-page "https://projects.gnome.org/brasero/") (synopsis "CD/DVD burning tool for Gnome") @@ -428,8 +427,7 @@ access the common Google services, and has full asynchronous support.") `(("gtk+" ,gtk+) ("libjpeg" ,libjpeg-turbo) ("lcms" ,lcms) - ("libtiff" ,libtiff) - ("nettle" ,nettle))) + ("libtiff" ,libtiff))) (propagated-inputs ;; In Requires of libgxps.pc. `(("cairo" ,cairo) @@ -818,10 +816,6 @@ forgotten when the session ends.") ("libcanberra" ,libcanberra) ("libsecret" ,libsecret) - ;; XXX: 'libarchive.pc' adds '-lnettle' so Nettle should really be - ;; propagated from there. - ("nettle" ,nettle) - ;; For tests. ("dogtail" ,python2-dogtail))) (native-inputs @@ -3332,8 +3326,7 @@ settings, themes, mouse settings, and startup of other daemons.") ("libgcrypt" ,libgcrypt) ("libxml2" ,libxml2))) (inputs - `(("nettle" ,nettle) - ("libsoup" ,libsoup))) + `(("libsoup" ,libsoup))) (home-page "https://projects.gnome.org/totem") (synopsis "Library to parse and save media playlists for GNOME") (description "Totem-pl-parser is a GObjects-based library to parse and save @@ -3788,7 +3781,6 @@ as possible!") ("libxml2" ,libxml2) ("liboauth" ,liboauth) ("libsoup" ,libsoup) - ("nettle" ,nettle) ("totem-pl-parser" ,totem-pl-parser))) (arguments `(#:phases @@ -3837,7 +3829,6 @@ for application developers.") ("pkg-config" ,pkg-config))) (inputs `(("grilo" ,grilo) - ("nettle" ,nettle) ; XXX: required by libgrlpls-0.3.la ("glib" ,glib) ("libxml2" ,libxml2) ("sqlite" ,sqlite) @@ -3926,7 +3917,6 @@ for application developers.") ("totem-pl-parser" ,totem-pl-parser) ("grilo" ,grilo) ("grilo-plugins" ,grilo-plugins) - ("nettle" ,nettle) ("vala" ,vala))) (arguments `(#:glib-or-gtk? #t @@ -4028,7 +4018,6 @@ which can read a large number of file formats.") ("python-pygobject" ,python2-pygobject) ("vala" ,vala) ("gmime" ,gmime) - ("nettle" ,nettle) ("adwaita-icon-theme" ,adwaita-icon-theme) ("grilo" ,grilo) ("grilo-plugins" ,grilo-plugins) @@ -4244,7 +4233,6 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") ("libsmbclient" ,samba) ("libsoup" ,libsoup) ("libxml2" ,libxml2) - ("nettle" ,nettle) ; XXX: required by libarchive.pc ("openssh" ,openssh) ("polkit" ,polkit) ("udisks" ,udisks))) @@ -4760,7 +4748,6 @@ share them with others via social networking and more.") ("json-glib" ,json-glib) ("libarchive" ,libarchive) ("libnotify" ,libnotify) - ("nettle" ,nettle) ("itstool" ,itstool) ("libxml2" ,libxml2))) (synopsis "Graphical archive manager for GNOME") @@ -6217,8 +6204,7 @@ as SASL, TLS and VeNCrypt. Additionally it supports encoding extensions.") (propagated-inputs `(("libarchive" ,libarchive))) ; XXX document why (inputs - `(("gtk+" ,gtk+) - ("nettle" ,nettle))) ; XXX: required by libarchive.pc + `(("gtk+" ,gtk+))) (synopsis "Archives integration support for GNOME") (home-page "https://git.gnome.org/browse/gnome-autoar/") (description @@ -6286,7 +6272,6 @@ easy, safe, and automatic.") ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) ("sqlite" ,sqlite) - ("nettle" ,nettle) ; XXX why is this needed? ("python" ,python) ("poppler" ,poppler) ("libgsf" ,libgsf) @@ -6355,7 +6340,6 @@ shared object databases, search tools and indexing.") ("gnome-autoar" ,gnome-autoar) ("libseccomp" ,libseccomp) ("libselinux" ,libselinux) - ("nettle" ,nettle) ; XXX required by libarchive.pc via gnome-autoar ("tracker" ,tracker) ;; XXX: gtk+ is required by libnautilus-extension.pc ;; diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8b7a31d110..998f197304 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -90,7 +90,6 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages netpbm) - #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) #:use-module (gnu packages nss) @@ -3182,7 +3181,6 @@ thanks to the use of namespaces.") (inputs `(("libarchive" ,libarchive) ("python" ,python-wrapper) - ("nettle" ,nettle) ("zlib" ,zlib) ("squashfs-tools" ,squashfs-tools))) (home-page "https://singularity.lbl.gov/") diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 9e9fda0929..ba90ccec73 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -56,7 +56,6 @@ #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages messaging) - #:use-module (gnu packages nettle) #:use-module (gnu packages nss) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pdf) @@ -819,7 +818,6 @@ infamous 'Wanda the Fish'.") ("libgnome-keyring" ,libgnome-keyring) ("libarchive" ,libarchive) ("marco" ,marco) - ("nettle" ,nettle) ("openjpeg" ,openjpeg-1) ("pango" ,pango) ;;("texlive" ,texlive) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b641340a1a..84bb3542f1 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -58,7 +58,6 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) - #:use-module (gnu packages nettle) #:use-module (gnu packages nss) #:use-module (gnu packages patchutils) #:use-module (gnu packages perl) @@ -542,7 +541,6 @@ symlinks to the files in a common directory such as /usr/local.") ("nss" ,nss) ("nspr" ,nspr) ("libarchive" ,libarchive) - ("nettle" ,nettle) ;XXX: actually a dependency of libarchive ("file" ,file) ("bzip2" ,bzip2) ("zlib" ,zlib) @@ -1012,7 +1010,6 @@ for packaging and deployment of cross-compiled Windows applications.") ("gpgme" ,gpgme) ("libarchive" ,libarchive) ("libsoup" ,libsoup) - ("nettle" ,nettle) ; required by 'libarchive.la' ("util-linux" ,util-linux))) (home-page "https://ostree.readthedocs.io/en/latest/") (synopsis "Operating system and container binary deployment and upgrades") @@ -1071,7 +1068,6 @@ the boot loader configuration.") ("libsoup" ,libsoup) ("libxau" ,libxau) ("libxml2" ,libxml2) - ("nettle" ,nettle) ("util-linux" ,util-linux))) (home-page "https://flatpak.org") (synopsis "System for building, distributing, and running sandboxed desktop -- cgit v1.3 From 1f78a9996428fe0082eacd55767397f4f5a7758a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 22 Sep 2019 23:49:57 +0200 Subject: gnu: perf: Really build without '-Werror'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Until this change, it would fail to build with: In file included from /tmp/guix-build-perf-5.2.15.drv-0/linux-5.2.15/tools/include/uapi/linux/ethtool.h:19:0, from xsk.c:18: /gnu/store/…-linux-libre-headers-4.19.56/include/linux/if_ether.h:165:1: error: packed attribute is unnecessary for 'ethhdr' [-Werror=packed] * gnu/packages/linux.scm (perf)[arguments]: In 'configure' phase, remove "-Werror" from 'tools/lib/bpf/Makefile'. --- gnu/packages/linux.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index be18788687..b65303ae6f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3082,6 +3082,10 @@ in a digital read-out.") (modify-phases %standard-phases (replace 'configure (lambda* (#:key inputs #:allow-other-keys) + ;; Don't build with '-Werror', really. + (substitute* "tools/lib/bpf/Makefile" + (("-Werror") "")) + (setenv "SHELL_PATH" (which "bash")) (chdir "tools/perf") #t))) -- cgit v1.3 From 5157edd8854c895dfb78f6cf49e906e49745ca8a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Sep 2019 16:13:43 +0200 Subject: gnu: perf: Treat kernel headers as system headers. * gnu/packages/linux.scm (perf)[arguments]: Instead of disabling -Werror, set C_INCLUDE_PATH. --- 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 6664620c04..d7e3d7ef7f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3091,15 +3091,16 @@ in a digital read-out.") (modify-phases %standard-phases (replace 'configure (lambda* (#:key inputs #:allow-other-keys) - ;; Don't build with '-Werror', really. - (substitute* "tools/lib/bpf/Makefile" - (("-Werror") "")) - (setenv "SHELL_PATH" (which "bash")) (chdir "tools/perf") #t))) #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) + ;; Make sure the kernel headers are treated as system + ;; headers to suppress warnings from those. + (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "kernel-headers") + "/include") "WERROR=0" ;; By default, 'config/Makefile' uses lib64 on -- cgit v1.3 From dd6989711370c43676edc974f86c8586f21f80f6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 3 Oct 2019 22:22:08 +0200 Subject: gnu: linux-libre: Try to aggressively gather entropy during boot. Fixes . * gnu/packages/patches/linux-libre-active-entropy.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/linux.scm (linux-libre-5.2-source): Use it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 3 +- .../patches/linux-libre-active-entropy.patch | 86 ++++++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/linux-libre-active-entropy.patch (limited to 'gnu/packages/linux.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 9f8ce842b6..b9b6ea3ae7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,6 +1078,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-remove-arch-warning.patch \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/linkchecker-tests-require-network.patch \ + %D%/packages/patches/linux-libre-active-entropy.patch \ %D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d7e3d7ef7f..2a6709c6fe 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -420,7 +420,8 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (define-public linux-libre-5.2-source (source-with-patches linux-libre-5.2-pristine-source - (list %boot-logo-patch + (list (search-patch "linux-libre-active-entropy.patch") + %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch))) (define-public linux-libre-4.19-source diff --git a/gnu/packages/patches/linux-libre-active-entropy.patch b/gnu/packages/patches/linux-libre-active-entropy.patch new file mode 100644 index 0000000000..8f081f4a19 --- /dev/null +++ b/gnu/packages/patches/linux-libre-active-entropy.patch @@ -0,0 +1,86 @@ +Try to actively add entropy instead of waiting forever. +Fixes . + +Taken from upstream: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=50ee7529ec4500c88f8664560770a7a1b65db72b + +diff --git a/drivers/char/random.c b/drivers/char/random.c +index 5d5ea4ce1442..2fda6166c1dd 100644 +--- a/drivers/char/random.c ++++ b/drivers/char/random.c +@@ -1731,6 +1731,56 @@ void get_random_bytes(void *buf, int nbytes) + } + EXPORT_SYMBOL(get_random_bytes); + ++ ++/* ++ * Each time the timer fires, we expect that we got an unpredictable ++ * jump in the cycle counter. Even if the timer is running on another ++ * CPU, the timer activity will be touching the stack of the CPU that is ++ * generating entropy.. ++ * ++ * Note that we don't re-arm the timer in the timer itself - we are ++ * happy to be scheduled away, since that just makes the load more ++ * complex, but we do not want the timer to keep ticking unless the ++ * entropy loop is running. ++ * ++ * So the re-arming always happens in the entropy loop itself. ++ */ ++static void entropy_timer(struct timer_list *t) ++{ ++ credit_entropy_bits(&input_pool, 1); ++} ++ ++/* ++ * If we have an actual cycle counter, see if we can ++ * generate enough entropy with timing noise ++ */ ++static void try_to_generate_entropy(void) ++{ ++ struct { ++ unsigned long now; ++ struct timer_list timer; ++ } stack; ++ ++ stack.now = random_get_entropy(); ++ ++ /* Slow counter - or none. Don't even bother */ ++ if (stack.now == random_get_entropy()) ++ return; ++ ++ timer_setup_on_stack(&stack.timer, entropy_timer, 0); ++ while (!crng_ready()) { ++ if (!timer_pending(&stack.timer)) ++ mod_timer(&stack.timer, jiffies+1); ++ mix_pool_bytes(&input_pool, &stack.now, sizeof(stack.now)); ++ schedule(); ++ stack.now = random_get_entropy(); ++ } ++ ++ del_timer_sync(&stack.timer); ++ destroy_timer_on_stack(&stack.timer); ++ mix_pool_bytes(&input_pool, &stack.now, sizeof(stack.now)); ++} ++ + /* + * Wait for the urandom pool to be seeded and thus guaranteed to supply + * cryptographically secure random numbers. This applies to: the /dev/urandom +@@ -1745,7 +1795,17 @@ int wait_for_random_bytes(void) + { + if (likely(crng_ready())) + return 0; +- return wait_event_interruptible(crng_init_wait, crng_ready()); ++ ++ do { ++ int ret; ++ ret = wait_event_interruptible_timeout(crng_init_wait, crng_ready(), HZ); ++ if (ret) ++ return ret > 0 ? 0 : ret; ++ ++ try_to_generate_entropy(); ++ } while (!crng_ready()); ++ ++ return 0; + } + EXPORT_SYMBOL(wait_for_random_bytes); + -- cgit v1.3 From c5ceec4150f6a6cdc1b64781afa2d05547cf8542 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 4 Oct 2019 21:36:42 +0200 Subject: gnu: linux-libre: Remove glibc from CPATH before the build. Fixes . * gnu/packages/linux.scm (make-linux-libre*)[arguments]: Drop "libc" from CPATH. --- gnu/packages/linux.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2a6709c6fe..78de223947 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -663,6 +663,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." `(#:modules ((guix build gnu-build-system) (guix build utils) (srfi srfi-1) + (srfi srfi-26) (ice-9 match)) #:phases (modify-phases %standard-phases @@ -679,6 +680,18 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ,@(if (%current-target-system) '((unsetenv "CROSS_CPATH")) '()) + + ;; On AArch64 (at least), we need to remove glibc headers from CPATH + ;; (they are still available as "system headers"), so that the kernel + ;; can override uint64_t. See . + (setenv "CPATH" + (string-join + (remove (cut string-prefix? (assoc-ref inputs "libc") <>) + (string-split (getenv "CPATH") #\:)) + ":")) + (format #t "environment variable `CPATH' changed to `~a'~%" + (getenv "CPATH")) + ;; Avoid introducing timestamps (setenv "KCONFIG_NOTIMESTAMP" "1") (setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH")) -- cgit v1.3