diff options
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 245 |
1 files changed, 174 insertions, 71 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4281ce4b0a..41b6dfd022 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -30,12 +30,11 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018, 2020 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2018 Manuel Graf <graf@init.at> -;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com> +;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019 Stefan Stefanović <stefanx2ovic@gmail.com> -;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2019, 2020, 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2020, 2021 Oleg Pykhalov <go.wigust@gmail.com> @@ -357,7 +356,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.14-version "5.14.2") +(define-public linux-libre-5.14-version "5.14.8") (define-public linux-libre-5.14-gnu-revision "gnu") (define deblob-scripts-5.14 (linux-libre-deblob-scripts @@ -367,30 +366,15 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-5.14-pristine-source (let ((version linux-libre-5.14-version) - (hash (base32 "05yw3i2c21dabdn5khyk60ds4h8krg5iyxk4zq1msv0igdfqf6gl"))) + (hash (base32 "12cvvrxky92z1g9kj7pgb83yg9pnv2fvi7jf0pyagvqjqladl3na"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.14))) -(define-public linux-libre-5.13-version "5.13.15") -(define-public linux-libre-5.13-gnu-revision "gnu1") -(define deblob-scripts-5.13 - (linux-libre-deblob-scripts - linux-libre-5.13-version - linux-libre-5.13-gnu-revision - (base32 "0hj3w3vh1rj24xgl4v72mr6vaz1qzsnc5xzdfjga1zy84bw8lhkp") - (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) -(define-public linux-libre-5.13-pristine-source - (let ((version linux-libre-5.13-version) - (hash (base32 "06v2jgzq2l56bjbymcrnaybqvvr1q44c0k534v77b3l5bwwlq2rk"))) - (make-linux-libre-source version - (%upstream-linux-source version hash) - deblob-scripts-5.13))) - ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; <https://www.kernel.org/category/releases.html> -(define-public linux-libre-5.10-version "5.10.63") +(define-public linux-libre-5.10-version "5.10.69") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -400,12 +384,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0bnbkd4vbf43m37wab4zwvcv3wy3ixh4x1zrwlfhi845i21mx88r"))) + (hash (base32 "1jhcl8qh4w4m2jnbp0glr6xbpn7phv17q6w3d247djnc7g2rwbr3"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.144") +(define-public linux-libre-5.4-version "5.4.149") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -415,12 +399,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "11aqp12xwbg7ysac3f9iaxwkhvasdg9bw4r43jj8af5bf61bjhxw"))) + (hash (base32 "1s1zka0iay0drgkdnmzf587jbrg1gx13xv26k5r1qc7dik8xc6p7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.206") +(define-public linux-libre-4.19-version "4.19.208") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -430,12 +414,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1h44lvzxd0cngj71bk8qba9dz7jlqj68ir6xjwfafglb81ppgsxp"))) + (hash (base32 "1556bk46v7pjd2xrvkldq254yc18cn9jll25ba8zig57562ahkg7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.246") +(define-public linux-libre-4.14-version "4.14.248") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -445,12 +429,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0fpgig84shpas1jc0h4s3aw9brkcq1as84gjbk4bfhc48bpi4mlw"))) + (hash (base32 "0m5nsd41b08xppcf7vvx8zgj3h3sp3n6xrgxfkccn6n4bk7yx4y9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.282") +(define-public linux-libre-4.9-version "4.9.284") (define-public linux-libre-4.9-gnu-revision "gnu1") (define deblob-scripts-4.9 (linux-libre-deblob-scripts @@ -460,12 +444,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "059fin4si93ya13xy831w84q496ksxidpd3kyw38918sfy4p6wk7"))) + (hash (base32 "0054b0cm0h2mbf6rxzdgd3c2rfz7xa32qkyr5lv58l2852hf0ri8"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.283") +(define-public linux-libre-4.4-version "4.4.285") (define-public linux-libre-4.4-gnu-revision "gnu1") (define deblob-scripts-4.4 (linux-libre-deblob-scripts @@ -475,7 +459,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1d9v4h4cbc4i371lhhwpxbmg88gna6xyi2ahfvv0clz60802y982"))) + (hash (base32 "0h8jzb2cg0wg4s07iqkghfxkxrnlxadwk3i3gvg2xs3ra0wrisp1"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) @@ -516,14 +500,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (search-patch "linux-libre-arm64-generic-pinebook-lcd.patch")))) -(define-public linux-libre-5.13-source - (source-with-patches linux-libre-5.13-pristine-source - (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch - ;; Pinebook Pro patch to fix LCD display - (search-patch - "linux-libre-arm64-generic-pinebook-lcd.patch")))) - (define-public linux-libre-5.10-source (source-with-patches linux-libre-5.10-pristine-source (list %boot-logo-patch @@ -636,11 +612,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." linux-libre-5.14-gnu-revision linux-libre-5.14-source)) -(define-public linux-libre-headers-5.13 - (make-linux-libre-headers* linux-libre-5.13-version - linux-libre-5.13-gnu-revision - linux-libre-5.13-source)) - (define-public linux-libre-headers-5.10 (make-linux-libre-headers* linux-libre-5.10-version linux-libre-5.10-gnu-revision @@ -949,18 +920,11 @@ It has been modified to remove all non-free binary blobs.") '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux") #:configuration-file kernel-config)) -(define-public linux-libre-5.13 - (make-linux-libre* linux-libre-5.13-version - linux-libre-5.13-gnu-revision - linux-libre-5.13-source - '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux") - #:configuration-file kernel-config)) - -(define-public linux-libre-version linux-libre-5.13-version) -(define-public linux-libre-gnu-revision linux-libre-5.13-gnu-revision) -(define-public linux-libre-pristine-source linux-libre-5.13-pristine-source) -(define-public linux-libre-source linux-libre-5.13-source) -(define-public linux-libre linux-libre-5.13) +(define-public linux-libre-version linux-libre-5.14-version) +(define-public linux-libre-gnu-revision linux-libre-5.14-gnu-revision) +(define-public linux-libre-pristine-source linux-libre-5.14-pristine-source) +(define-public linux-libre-source linux-libre-5.14-source) +(define-public linux-libre linux-libre-5.14) (define-public linux-libre-5.10 (make-linux-libre* linux-libre-5.10-version @@ -1194,9 +1158,9 @@ It has been modified to remove all non-free binary blobs.") (define-public linux-libre-with-bpf (let ((base-linux-libre (make-linux-libre* - linux-libre-5.13-version - linux-libre-5.13-gnu-revision - linux-libre-5.13-source + linux-libre-5.14-version + linux-libre-5.14-gnu-revision + linux-libre-5.14-source '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux") #:extra-version "bpf" @@ -1582,6 +1546,43 @@ allows some more serious things like adding streaming capabilities to an application by hooking GStreamer into the loopback device.") (license license:gpl2+))) +(define-public xpadneo + (package + (name "xpadneo") + (version "0.9.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atar-axis/xpadneo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xr0zx134s56h4ij6c3fh8ki0h58h61minbfxcl3sgpgxkh14ism")))) + (build-system linux-module-build-system) + (arguments + `(#:tests? #f ; no `check' target + #:source-directory "hid-xpadneo/src" + #:phases + (modify-phases %standard-phases + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively "hid-xpadneo/etc-modprobe.d" + (string-append out "/etc/modprobe.d")) + ;; udev-service-type takes its rules from /lib rather than + ;; /etc, so copy it there instead + (copy-recursively "hid-xpadneo/etc-udev-rules.d" + (string-append out "/lib/udev/rules.d")))))))) + (home-page "https://atar-axis.github.io/xpadneo/") + (synopsis "Xbox One Wireless Controller driver") + (description + "This package provides a driver for the XBox One S Wireless controller +and some newer models when connected via bluetooth. In addition to the kernel +module provided itself, it also contains a modprobe configuration and udev +rules, which need to be installed separately.") + (license license:gpl3+))) + ;;; ;;; Pluggable authentication modules (PAM). @@ -2156,6 +2157,38 @@ slabtop, tload, top, vmstat, w, watch and sysctl.") "Tools for working with USB devices, such as lsusb.") (license license:gpl2+))) +(define-public usbip-utils + (package + (name "usbip-utils") + (version (package-version linux-libre)) + (source (package-source linux-libre)) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'enter-subdirectory + (lambda _ + (chdir "tools/usb/usbip") + #t))))) + (native-inputs + `(("automake" ,automake) + ("autoreconf" ,autoconf) + ("libtool" ,libtool))) + (inputs `(("eudev" ,eudev))) + (home-page (package-home-page linux-libre)) + (synopsis "Utilities for sharing USB devices over IP networks") + (description + "The USB/IP protocol enables to pass USB device from a server to +a client over the network. The server is a machine which shares an +USB device and the client is a machine which uses USB device provided by +a server over the network. The USB device may be either physical device +connected to a server or software entity created on a server using USB +gadget subsystem. The usbip-utils are userspace tools to used to handle +connection and management on both side. The client needs the @file{vhci-hcd} +Linux kernel module and the server needs the @file{usbip_host} Linux kernel +module.") + (license license:gpl2))) + (define-public e2fsprogs (package (name "e2fsprogs") @@ -5345,7 +5378,7 @@ and copy/paste text in the console and in xterm.") (define-public btrfs-progs (package (name "btrfs-progs") - (version "5.13.1") + (version "5.14") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" @@ -5353,7 +5386,7 @@ and copy/paste text in the console and in xterm.") "btrfs-progs-v" version ".tar.xz")) (sha256 (base32 - "16gkyhvvpqpq0skpavkvnmglbld7p331bnpiqn2z9flgwq0mlzix")))) + "0mwxhwws6scjjpfws5xp7988wwwfa46jp5y3kn6jjmjpxiqm85da")))) (build-system gnu-build-system) (outputs '("out" "static")) ; static versions of the binaries in "out" @@ -5902,15 +5935,14 @@ invocations of itself.") (define-public ntfs-3g (package (name "ntfs-3g") - (version "2017.3.23") + (version "2021.8.22") (source (origin (method url-fetch) (uri (string-append "https://tuxera.com/opensource/" "ntfs-3g_ntfsprogs-" version ".tgz")) - (patches (search-patches "ntfs-3g-CVE-2019-9755.patch")) (sha256 (base32 - "1mb228p80hv97pgk3myyvgp975r9mxq56c6bdn1n24kngcfh4niy")) + "1yrf42xr92qv3pads8lzp5nyssz6875ncfgg8v3jwjyr0nm87f2m")) (modules '((guix build utils))) (snippet '(begin ;; Install under $prefix. @@ -5919,8 +5951,8 @@ invocations of itself.") "@sbindir@")) #t)))) (build-system gnu-build-system) - (inputs `(("util-linux" ,util-linux) - ("fuse" ,fuse))) ;libuuid + (inputs `(("util-linux" ,util-linux) ; libuuid + ("fuse" ,fuse))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments '(#:configure-flags (list "--disable-static" @@ -6718,7 +6750,7 @@ interface in sysfs, which can be accomplished with the included udev rules.") (define-public tlp (package (name "tlp") - (version "1.3.1") + (version "1.4.0") (source (origin (method git-fetch) @@ -6727,7 +6759,7 @@ interface in sysfs, which can be accomplished with the included udev rules.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "14fcnaz9pw534v4d8dddqq4wcvpf1kghr8zlrk62r5lrl46sp1p5")))) + (base32 "0bnsz9bw9rj1apl80jwz39zj5mnlps3jbckihvl8bbdbrbhj6p06")))) (native-inputs `(("shellcheck" ,shellcheck))) (inputs @@ -6778,6 +6810,8 @@ interface in sysfs, which can be accomplished with the included udev rules.") (setenv "TLP_CONFDEF" (string-append out "/share/tlp/defaults.conf")) (setenv "TLP_CONFDIR" (string-append out "/etc/tlp.d")) + (setenv "TLP_CONFREN" + (string-append out "/share/tlp/rename.conf")) (setenv "TLP_ELOD" (string-append out "/lib/elogind/system-sleep")) (setenv "TLP_SHCPL" @@ -7624,8 +7658,24 @@ IP addresses and routes, and configure IPsec.") (base32 "0dqf5j2sw4hq68rqvxbrsf44ygfzx9ypiyzipk4cvp9aimbvsbc6")))) (build-system meson-build-system) + ;; Install static libraries for use by the initrd's xfsprogs/static. + (outputs (list "out" "static")) (arguments - '(#:configure-flags '("-Ddistro_install=true" "-Ddefault_library=shared"))) + `(#:configure-flags + (list "-Ddistro_install=true" + "-Ddefault_library=both") + #:phases + (modify-phases %standard-phases + (add-after 'install 'separate-static + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (with-directory-excursion out + (for-each (lambda (source) + (let ((target (string-append static "/" source))) + (mkdir-p (dirname target)) + (rename-file source target))) + (find-files "lib" "\\.a$"))))))))) (home-page "https://github.com/benhoyt/inih") (synopsis "Simple .INI parser library for C") (description "The inih (INI Not Invented Here) library is a simple .INI file @@ -7651,6 +7701,8 @@ compatible with Python's ConfigParser style of .INI files, including RFC (outputs (list "out" "python")) (arguments `(#:tests? #f ; kernel/user integration tests are in package "xfstests" + #:make-flags + (list "V=1") #:phases (modify-phases %standard-phases (add-after 'install 'separate-python-output @@ -7664,8 +7716,8 @@ compatible with Python's ConfigParser style of .INI files, including RFC (string-append python script))) (list "/sbin/xfs_scrub_all"))))) (add-after 'install 'install-headers - (lambda _ - (invoke "make" "install-dev")))))) + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install-dev" make-flags)))))) (native-inputs `(("gettext" ,gettext-minimal))) (inputs @@ -7680,6 +7732,57 @@ file systems.") ;; licensed under lgpl2.1. the other stuff is licensed under gpl2. (license (list license:gpl2 license:lgpl2.1)))) +(define-public xfsprogs/static + (package + (inherit xfsprogs) + (name "xfsprogs-static") + (outputs (list "out")) + (arguments + (substitute-keyword-arguments (package-arguments xfsprogs) + ((#:make-flags make-flags ''()) + `(cons* "LLDFLAGS=-all-static" ,make-flags)) + ((#:phases _ ''()) + `(modify-phases %standard-phases + (add-after 'install 'delete-useless-files + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion (assoc-ref outputs "out") + (for-each delete-file-recursively + (list "include" "lib"))))))))) + (inputs + `(("libinih:static" ,libinih "static") + ("util-linux:static" ,util-linux "static") + ,@(remove (match-lambda + ((label . _) + (member label '("python")))) + (package-inputs xfsprogs)))) + (synopsis "Statically linked XFS file system tools"))) + +(define-public xfs_repair/static + (package + (name "xfs_repair-static") + (version (package-version xfsprogs/static)) + (source #f) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((xfsprogs (assoc-ref %build-inputs "xfsprogs")) + (out (assoc-ref %outputs "out")) + (sbin (string-append out "/sbin"))) + (install-file (string-append xfsprogs "/sbin/xfs_repair") sbin) + (with-directory-excursion sbin + (remove-store-references "xfs_repair")))))) + (inputs + `(("xfsprogs" ,xfsprogs/static))) + (home-page (package-home-page xfsprogs/static)) + (synopsis "Statically linked @command{xfs_repair} from xfsprogs") + (description + "This package provides a statically linked @command{xfs_repair} taken +from the xfsprogs package. It is meant to be used in initrds.") + (license (package-license xfsprogs/static)))) + (define-public genext2fs (package (name "genext2fs") |