X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/ec8130eb23b79c2b8b61043f25dafcefd0daafe7..357b9f9d71464180ca78f58abf3a2810ccb589f3:/gnu/packages/linux.scm diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 661b7ed2ca..a1e5d0024b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2018 Pierre Langlois +;;; Copyright © 2018 Vasile Dumitrascu ;;; ;;; This file is part of GNU Guix. ;;; @@ -231,6 +232,18 @@ defconfig. Return the appropriate make target if applicable, otherwise return (base32 "1hk9swxxc80bmn2zd2qr5ccrjrk28xkypwhl4z0qx4hbivj7qm06")))) +(define %linux-libre-arm-export-__sync_icache_dcache-patch + (origin + (method url-fetch) + (uri (string-append + "https://salsa.debian.org/kernel-team/linux" + "/raw/34a7d9011fcfcfa38b68282fd2b1a8797e6834f0" + "/debian/patches/bugfix/arm/" + "arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch")) + (file-name "linux-libre-4.19-arm-export-__sync_icache_dcache.patch") + (sha256 + (base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f")))) + (define* (kernel-config arch #:key variant) "Return the absolute file name of the Linux-Libre build configuration file for ARCH and optionally VARIANT, or #f if there is no such configuration." @@ -294,14 +307,16 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ("elfutils" ,elfutils) ; Needed to enable CONFIG_STACK_VALIDATION ("flex" ,flex) ("bison" ,bison) - ;; On x86, build with GCC-7 for full retpoline support. + + ;; Build with GCC-7 for full retpoline support. ;; FIXME: Remove this when our default compiler has retpoline support. - ,@(match (system->linux-architecture - (or (%current-target-system) (%current-system))) - ((or "x86_64" "i386") - `(("gcc" ,gcc-7))) - (_ - '())) + ("gcc" ,gcc-7) + + ;; These are needed to compile the GCC plugins. + ("gmp" ,gmp) + ("mpfr" ,mpfr) + ("mpc" ,mpc) + ,@(match (and configuration-file (configuration-file (system->linux-architecture @@ -323,6 +338,11 @@ 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 @@ -393,38 +413,36 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %intel-compatible-systems '("x86_64-linux" "i686-linux")) -(define %linux-compatible-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux")) +(define %linux-libre-version "4.20.2") +(define %linux-libre-hash "0y95gxckiwgz4jhkv3hq2apbq00w8281sf7lnajmpvc8bdlnmri1") -;; linux-libre configuration for armhf-linux is derived from Debian armmp. It -;; supports qemu "virt" machine and possibly a large number of ARM boards. -;; See : https://wiki.debian.org/DebianKernel/ARMMP. - -(define %linux-libre-version "4.19.2") -(define %linux-libre-hash "1yh4ll9qh4wmf9r62ksyic57g1iy1b84qbv855l545ilk12znbmj") - -(define %linux-libre-4.19-patches +(define %linux-libre-4.20-patches (list %boot-logo-patch - (origin - (method url-fetch) - (uri (string-append - "https://salsa.debian.org/kernel-team/linux" - "/raw/34a7d9011fcfcfa38b68282fd2b1a8797e6834f0" - "/debian/patches/bugfix/arm/" - "arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch")) - (file-name "linux-libre-4.18-arm-export-__sync_icache_dcache.patch") - (sha256 - (base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f"))))) + %linux-libre-arm-export-__sync_icache_dcache-patch)) (define-public linux-libre (make-linux-libre %linux-libre-version %linux-libre-hash - %linux-compatible-systems + '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux") + #:patches %linux-libre-4.20-patches + #:configuration-file kernel-config)) + +(define %linux-libre-4.19-version "4.19.15") +(define %linux-libre-4.19-hash "1aq09hhkf9ba5gck4m9g5ypvj76j9147f2bfyml076ln0ycdr7c7") + +(define %linux-libre-4.19-patches + (list %boot-logo-patch + %linux-libre-arm-export-__sync_icache_dcache-patch)) + +(define-public linux-libre-4.19 + (make-linux-libre %linux-libre-4.19-version + %linux-libre-4.19-hash + '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.81") -(define %linux-libre-4.14-hash "0vxs8k7ka8aqnn1fcr88bhr07wa5jg83pq1rcjby9k422mbv254q") +(define %linux-libre-4.14-version "4.14.93") +(define %linux-libre-4.14-hash "051ijhwjq04lzzz1iw9ar7lgllh1acyvr8bxak01chnph6vc2qas") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version @@ -433,21 +451,29 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.137" - "1d8313r2k0qr4x7nqlnbwn5lzfc7dz6w8sfg47jml1q38c2fyjf2" - %intel-compatible-systems + (make-linux-libre "4.9.150" + "1zlscj43i1limmkda07qcbszg89p6fcnlsqlbdxvm1xmf87v3mmw" + '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.163" - "05j0dm0cxilanp5z40n8kgjz9vn1p4rg63kksicd2v48w8ka82z6" - %intel-compatible-systems + (make-linux-libre "4.4.170" + "0gdwqicinv3pj8fz92y85v6na1apanjj5y983qnnwpsdmrx3vkmv" + '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) (define-public linux-libre-arm-generic (make-linux-libre %linux-libre-version %linux-libre-hash '("armhf-linux") + #:patches %linux-libre-4.20-patches + #:defconfig "multi_v7_defconfig" + #:extra-version "arm-generic")) + +(define-public linux-libre-arm-generic-4.19 + (make-linux-libre %linux-libre-4.19-version + %linux-libre-4.19-hash + '("armhf-linux") #:patches %linux-libre-4.19-patches #:defconfig "multi_v7_defconfig" #:extra-version "arm-generic")) @@ -463,6 +489,14 @@ It has been modified to remove all non-free binary blobs.") (make-linux-libre %linux-libre-version %linux-libre-hash '("armhf-linux") + #:patches %linux-libre-4.20-patches + #:defconfig "omap2plus_defconfig" + #:extra-version "arm-omap2plus")) + +(define-public linux-libre-arm-omap2plus-4.19 + (make-linux-libre %linux-libre-4.19-version + %linux-libre-4.19-hash + '("armhf-linux") #:patches %linux-libre-4.19-patches #:defconfig "omap2plus_defconfig" #:extra-version "arm-omap2plus")) @@ -757,7 +791,7 @@ slabtop, and skill.") (define-public e2fsprogs (package (name "e2fsprogs") - (version "1.44.3") + (version "1.44.5") (source (origin (method url-fetch) (uri (string-append @@ -766,7 +800,7 @@ slabtop, and skill.") name "-" version ".tar.xz")) (sha256 (base32 - "1djb9qnid1j0vvna2bhq4jsz2ig1xckbx7h4d86cr0gl61yrz2ax")))) + "1ff56h6h1h17sj2zvlddv5c88nmbx46p1fcbh6b0s5k9kl3b6pms")))) (build-system gnu-build-system) (inputs `(("util-linux" ,util-linux))) (native-inputs `(("pkg-config" ,pkg-config) @@ -937,7 +971,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.") (define-public strace (package (name "strace") - (version "4.25") + (version "4.26") (home-page "https://strace.io") (source (origin (method url-fetch) @@ -945,7 +979,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.") "/strace-" version ".tar.xz")) (sha256 (base32 - "00f7zagfh3np5gwi0z7hi7zjd7s5nixcaq7z78n87dvhakkgi1fn")))) + "070yz8xii8gnb4psiz628zwm5srh266sfb06f7f1qzagxzz2ykbw")))) (build-system gnu-build-system) (arguments '(#:phases @@ -964,7 +998,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.") (description "strace is a system call tracer, i.e. a debugging tool which prints out a trace of all the system calls made by a another process/program.") - (license license:bsd-3))) + (license license:lgpl2.1+))) (define-public ltrace (package @@ -1777,9 +1811,9 @@ UnionFS-FUSE additionally supports copy-on-write.") #t)))))) (inputs `(("fuse" ,fuse-static))))) -(define-public sshfs-fuse +(define-public sshfs (package - (name "sshfs-fuse") + (name "sshfs") (version "2.10") (source (origin (method url-fetch) @@ -1804,6 +1838,11 @@ up: on the server side there's nothing to do; on the client side mounting the file system is as easy as logging into the server with an SSH client.") (license license:gpl2+))) +(define-public sshfs-fuse + (package (inherit sshfs) + (name "sshfs-fuse") + (properties `((superseded . ,sshfs))))) + (define-public archivemount (package (name "archivemount") @@ -2612,7 +2651,7 @@ thanks to the use of namespaces.") (define-public singularity (package (name "singularity") - (version "2.5.1") + (version "2.6.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/singularityware/singularity/" @@ -2620,7 +2659,7 @@ thanks to the use of namespaces.") "/singularity-" version ".tar.gz")) (sha256 (base32 - "0f28dgf2qcy8ljjfix7p9q36q12j7rxyicfzzi4n0fl8zr8ab88g")))) + "1whx0hqqi1326scgdxxxa1d94vn95mnq0drid6s8wdp84ni4d3gk")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -4049,7 +4088,7 @@ under OpenGL graphics workloads.") (define-public efivar (package (name "efivar") - (version "35") + (version "37") (source (origin (method url-fetch) (uri (string-append "https://github.com/rhboot/" name @@ -4057,7 +4096,7 @@ under OpenGL graphics workloads.") "-" version ".tar.bz2")) (sha256 (base32 - "153k2ifyl4giz5fkryxhz8z621diqjy7v25hfga4z94rs32ks0qy")))) + "17vvfivhsrszh7q39b6npjsrhrhsjf1cmmcpp3xrh6wh7ywzwrrw")))) (build-system gnu-build-system) (arguments `(;; Tests require a UEFI system and is not detected in the chroot. @@ -4973,3 +5012,29 @@ infrastructure for in-kernel netfilter subsystems (such as nfnetlink_log, nfnetlink_queue, nfnetlink_conntrack) and their respective users and/or management tools in userspace.") (license license:gpl2))) + +(define-public xfsprogs + (package + (name "xfsprogs") + (version "4.19.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kernel.org/linux/utils/fs/xfs/xfsprogs/" + "xfsprogs-" version ".tar.gz")) + (sha256 + (base32 + "0gs39yiyamjw516jbak3nj4dy4h2a2g48c1mmv4wbppsccvwmwh5")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f)) ; Kernel/user integration tests are in package "xfstests" + (native-inputs + `(("gettext" ,gettext-minimal) + ("util-linux" ,util-linux))) + (home-page "https://xfs.wiki.kernel.org/") + (synopsis "XFS file system tools") + (description "This package provides commands to create and check XFS +file systems.") + ;; The library "libhandle" and the headers in "xfslibs-dev" are + ;; licensed under lgpl2.1. the other stuff is licensed under gpl2. + (license (list license:gpl2 license:lgpl2.1))))