diff options
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 130 |
1 files changed, 69 insertions, 61 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9f01c6d318..9dd08c0843 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -164,7 +164,6 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages netpbm) #:use-module (gnu packages networking) - #:use-module (gnu packages ninja) #:use-module (gnu packages nss) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) @@ -515,17 +514,17 @@ 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-6.15-version "6.15.5") +(define-public linux-libre-6.15-version "6.15.6") (define-public linux-libre-6.15-gnu-revision "gnu") (define deblob-scripts-6.15 (linux-libre-deblob-scripts linux-libre-6.15-version linux-libre-6.15-gnu-revision - (base32 "0v0fsw3av42xbayy3g11cxyin3hda8s3b103sin05yc80r16584b") + (base32 "05fr8s00ljj7v26z3gb1yrfna42i7zy36x6wrg74ai5hwwc7jfnd") (base32 "05153ci3sk9gsq8vgk6phvzszldaj2psmyp10cjivm3gl6qvkbhk"))) (define-public linux-libre-6.15-pristine-source (let ((version linux-libre-6.15-version) - (hash (base32 "1dc8qrwvvy34s5lgm43j295ipwaqm8wd8x4qchr14hqlkj9hg9rc"))) + (hash (base32 "1z5l0b59q56qj6s56cxzv43lhfx9z9sp4vfziw60fz97ak4qdd9b"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.15))) @@ -549,22 +548,22 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; Here are the support timelines: ;; <https://www.kernel.org/category/releases.html> -(define-public linux-libre-6.12-version "6.12.36") +(define-public linux-libre-6.12-version "6.12.38") (define-public linux-libre-6.12-gnu-revision "gnu") (define deblob-scripts-6.12 (linux-libre-deblob-scripts linux-libre-6.12-version linux-libre-6.12-gnu-revision (base32 "0y6i9ifax1a8bxih3rr9xzy3mj61ssgx9yfsy6fh94mni6wl51gp") - (base32 "0g08l17f57wkh2jfj4n2k7f7ikm87aj55npljvwd1lns7v5p90xr"))) + (base32 "1hc3fgc0wajlwbsjkvfcxvmjw4bcxfbrnbfbcasbczz7if4f0fvf"))) (define-public linux-libre-6.12-pristine-source (let ((version linux-libre-6.12-version) - (hash (base32 "135s057ya63zw4v1jr9lzjdxk60ahr9v38hbv6nima755pnql5ja"))) + (hash (base32 "1k0gcwavn5iws3z1as39227i2hnc62qnfddjfqy7k7ymhf6zldgh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.12))) -(define-public linux-libre-6.6-version "6.6.96") +(define-public linux-libre-6.6-version "6.6.98") (define-public linux-libre-6.6-gnu-revision "gnu") (define deblob-scripts-6.6 (linux-libre-deblob-scripts @@ -574,12 +573,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1zzpk2hpv76lylip4j7jkn0jqcjj15h3jff22x22i73mwz2kiqgk"))) (define-public linux-libre-6.6-pristine-source (let ((version linux-libre-6.6-version) - (hash (base32 "1p8v49w7z8w3wc68mbw46cz9xqrllc8cpa7nqlm2xnrssi1mir4y"))) + (hash (base32 "1raxyhvv0yay3k1izwcqdbq9322nflflfzcn9d1jrhmb032k8si9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.6))) -(define-public linux-libre-6.1-version "6.1.143") +(define-public linux-libre-6.1-version "6.1.145") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts @@ -589,12 +588,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1hzjr44hy8px4n3x5my2syhd60chkfy79ajgzvlz04pc5yf6ihpi"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "02ivq22hv42bcnssfpkkbqlhz1by9jrfrqlrz1wi0svysz2dlnz2"))) + (hash (base32 "0qrkcrqb0migsrq6xl1idyz8n6vjbdk74z4sc9na97b6n5vp0r9i"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -(define-public linux-libre-5.15-version "5.15.186") +(define-public linux-libre-5.15-version "5.15.188") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -604,7 +603,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0rg65s6kd9gxxa3wl6180pr39rb6zbcicwjik4kygs2ns0247y56"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0anbf7v0m26da0c6d0z925im4x2kf8kswpbv056543amxvbzsklw"))) + (hash (base32 "1nfcrdwa2mgih57ch9kh8gc6jl950a7vpqgr56xk1b02303km5f4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) @@ -2662,7 +2661,7 @@ supported under @file{/sys/class/backlight/}.") (define-public v4l2loopback-linux-module (package (name "v4l2loopback-linux-module") - (version "0.15.0") + (version "0.15.1") (source (origin (method git-fetch) (uri (git-reference @@ -2671,7 +2670,7 @@ supported under @file{/sys/class/backlight/}.") (file-name (git-file-name name version)) (sha256 (base32 - "1vp7f3ssvlbsxrwx6ix890yk589na6zhi0z3p1yl00fa813wcidh")))) + "00vkn4c1wlfmf8kqklklxj5kalwgiwwnxwbh4pw7dj9l1ivycm4f")))) (build-system linux-module-build-system) (arguments (list #:tests? #f)) ; no test suite @@ -7900,9 +7899,8 @@ from the ntfs-3g package. It is meant to be used in initrds.") ;; Upstream uses the "ninja" build system and encourage distros ;; to do the same for consistency. - #:configure-flags (list "-GNinja" - - ,@(if (%current-target-system) + #:generator "Ninja" + #:configure-flags (list ,@(if (%current-target-system) `((string-append "-DPKG_CONFIG_EXECUTABLE=" (search-input-file @@ -7912,18 +7910,9 @@ from the ntfs-3g package. It is meant to be used in initrds.") '()) (string-append "-DRST2MAN_EXECUTABLE=" (search-input-file - %build-inputs "/bin/rst2man.py"))) - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda _ - (invoke "ninja" - "-j" (number->string (parallel-job-count))))) - (replace 'install - (lambda _ - (invoke "ninja" "install")))))) + %build-inputs "/bin/rst2man.py"))))) (native-inputs - (list ninja pkg-config python-wrapper python-docutils)) ;for 'rst2man' + (list pkg-config python-wrapper python-docutils)) ;for 'rst2man' (inputs (list libnl eudev)) (home-page "https://github.com/linux-rdma/rdma-core") @@ -7991,7 +7980,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (package (name "rng-tools") (home-page "https://github.com/nhorman/rng-tools") - (version "6.16") + (version "6.17") (source (origin (method git-fetch) (uri (git-reference (url home-page) @@ -7999,7 +7988,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (file-name (git-file-name name version)) (sha256 (base32 - "1rsk8nxs0j32b9hr88qk8hv029fb1q0hcrw0mfdywvm7dn2d15gn")) + "0vvqi9ha4jbk4086x2q98p4ip3z56sfdpyckdyknsd36zhp6z8n2")) (patches (search-patches "rng-tools-revert-build-randstat.patch")) (patch-flags '("-p0")))) @@ -8172,6 +8161,24 @@ not as a replacement for it.") #:configure-flags #~(list "-DINSTALL_KAUTH_HELPER=OFF" "-DQT6_BUILD=ON") #:qtbase qtbase + ;; The 'tst_models' and 'tst_callgraphgenerator' fail, with + ;; the later seemingly requiring sudo or access to the kernel + ;; trace points. + #:test-exclude + (string-append + "(" + (string-join + ;; The 'tst_models' expected output doesn't exactly + ;; match. + '("tst_models" + ;; The 'tst_callgraphgenerator' perf invocation + ;; fails when run in the build container. + "tst_callgraphgenerator" + ;; The 'tst_perfparser' test requires sudo/access + ;; to the kernel scheduler trace points. + "tst_perfparser") + "|") + ")") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-perfparser @@ -8207,28 +8214,7 @@ not as a replacement for it.") (substitute* "src/perfrecord.cpp" (("\"perf( )?\"" _ space) (string-append "\"" (search-input-file inputs "bin/perf") - (or space "") "\""))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; The 'tst_models' and 'tst_callgraphgenerator' fail, with - ;; the later seemingly requiring sudo or access to the kernel - ;; trace points. - (invoke "ctest" "-E" - (string-append - "(" - (string-join - ;; The 'tst_models' expected output doesn't exactly - ;; match. - '("tst_models" - ;; The 'tst_callgraphgenerator' perf invocation - ;; fails when run in the build container. - "tst_callgraphgenerator" - ;; The 'tst_perfparser' test requires sudo/access - ;; to the kernel scheduler trace points. - "tst_perfparser") - "|") - ")")))))))) + (or space "") "\"")))))))) (native-inputs (list extra-cmake-modules vulkan-headers)) @@ -10771,7 +10757,9 @@ set as @code{LD_PRELOAD} to override the C library file system functions.") #$(string-append "-DFALCOSECURITY_LIBS_VERSION=" version)) ;; Only the libsinsp test suite is run, as the one for libscap requires ;; elevated privileges. - #:test-target "run-unit-test-libsinsp" + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'disable-problematic-tests @@ -10781,6 +10769,10 @@ set as @code{LD_PRELOAD} to override the C library file system functions.") ;; exists in the build environment. (("TEST_F\\(usergroup_manager_test, system_lookup)") "TEST_F(usergroup_manager_test, DISABLED_system_lookup)")))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "run-unit-test-libsinsp" args))) (add-after 'install 'delete-src (lambda _ (delete-file-recursively @@ -11310,11 +11302,7 @@ modification of BPF objects on the system.") (build-system cmake-build-system) (arguments (list - #:configure-flags #~(list "-DBUILD_TESTING=ON") - ;; Only run the unit tests suite, as the other ones - ;; (runtime_tests, tools-parsing-test) require to run as - ;; 'root'. - #:test-target "bpftrace_test" + #:test-exclude "(runtime_tests|tools-parsing-test)" #:phases #~(modify-phases %standard-phases ;; This patch also fixes broken compilation due to improper detection @@ -11336,8 +11324,28 @@ modification of BPF objects on the system.") "runtime/call" "procmon.cpp") (("/bin/ls") - (which "ls"))))))))) - (native-inputs (list bison dwarves flex googletest xxd)) + (which "ls")))))) + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* '("tests/child.cpp") + (("/bin/sleep") + (search-input-file inputs "bin/sleep"))))) + (add-before 'check 'set-test-filter + (lambda _ + (setenv "GTEST_FILTER" + (string-join + (list ; "-" disables all following tests + "-ast.probe_name_uprobe" + "bpftrace.add_probes_uprobe_wildcard_file" + "bpftrace.add_probes_uprobe_wildcard_file_uprobe_multi" + "bpftrace.add_probes_usdt_wildcard" + "Parser.multiple_attach_points_kprobe" + "Parser.uretprobe_offset" + "semantic_analyser.builtin_functions" + "semantic_analyser.call_func" + "semantic_analyser.call_uaddr") + ":"))))))) + (native-inputs (list bison coreutils dwarves flex googletest xxd)) (inputs (list bcc clang-15 elfutils libbpf libiberty cereal)) (home-page "https://github.com/bpftrace/bpftrace") (synopsis "High-level tracing language for Linux eBPF") |