[PATCH] Update bcc and bpftrace kernel headers

  • Open
  • quality assurance status badge
Details
One participant
  • John Soo
Owner
unassigned
Submitted by
John Soo
Severity
normal
J
J
John Soo wrote on 5 Dec 2020 05:55
(address . bug-guix@gnu.org)
87tut0lulk.fsf@asu.edu
Hi Guix,

I tried to use bpftrace recently and discovered I needed the right
kernel headers compiled in (5.9 being the default now). Perhaps
linux-libre-headers should be upgraded to 5.9 instead?

What do you think?

- John
From bf8d069f70fecc8e24a795efa69252d1cf9b1865 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Fri, 4 Dec 2020 20:36:11 -0800
Subject: [PATCH 1/2] gnu: Use 5.9 kernel headers for bcc.

* gnu/packages/linux.scm (bcc): [inputs] Update dependency.
---
gnu/packages/linux.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3d36468172..ce88ad3348 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7472,7 +7472,7 @@ headers.")
;; archives, only object files.
;; https://github.com/iovisor/bcc/issues/504
("elfutils" ,elfutils)
- ("linux-libre-headers" ,linux-libre-headers)
+ ("linux-libre-headers" ,linux-libre-headers-5.9)
("luajit" ,luajit)
("python-wrapper" ,python-wrapper)))
(arguments
--
2.29.2
From c6f6595d6103f310f5925941edc3696def1826b4 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Fri, 4 Dec 2020 20:37:15 -0800
Subject: [PATCH 2/2] gnu: Use 5.9 kernel headers for bpftrace.

* gnu/packages/linux.scm (bpftrace): [inputs] Update dependency.
---
gnu/packages/linux.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ce88ad3348..dae3efd462 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7552,7 +7552,7 @@ and above.")
("clang-toolchain" ,clang-toolchain)
("elfutils" ,elfutils)
("libbpf" ,libbpf)
- ("linux-libre-headers" ,linux-libre-headers)))
+ ("linux-libre-headers" ,linux-libre-headers-5.9)))
(arguments
`(#:tests? #f ;Tests require googletest sources.
#:configure-flags
--
2.29.2
J
J
John Soo wrote on 1 Jan 2021 19:27
(address . 45049@debbugs.gnu.org)
87o8i83429.fsf@asu.edu
Updated to kernel 5.10.
From 83c0d125e505d8d0695cd3b58806e31cf4c0cf22 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Fri, 4 Dec 2020 20:36:11 -0800
Subject: [PATCH 1/2] gnu: Use 5.10 kernel headers for bcc.

* gnu/packages/linux.scm (bcc): [inputs] Update dependency.
---
gnu/packages/linux.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 6b0e9f6c8f..4bf4f6e94e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7520,7 +7520,7 @@ headers.")
;; archives, only object files.
;; https://github.com/iovisor/bcc/issues/504
("elfutils" ,elfutils)
- ("linux-libre-headers" ,linux-libre-headers)
+ ("linux-libre-headers" ,linux-libre-headers-5.10)
("luajit" ,luajit)
("python-wrapper" ,python-wrapper)))
(arguments
--
2.29.2
From 5ce6e3af98369c2dbd66addd78b93984c8346d9f Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Fri, 4 Dec 2020 20:37:15 -0800
Subject: [PATCH 2/2] gnu: Use 5.10 kernel headers for bpftrace.

* gnu/packages/linux.scm (bpftrace): [inputs] Update dependency.
---
gnu/packages/linux.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4bf4f6e94e..c463c69f95 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7600,7 +7600,7 @@ and above.")
("clang-toolchain" ,clang-toolchain)
("elfutils" ,elfutils)
("libbpf" ,libbpf)
- ("linux-libre-headers" ,linux-libre-headers)))
+ ("linux-libre-headers" ,linux-libre-headers-5.10)))
(arguments
`(#:tests? #f ;Tests require googletest sources.
#:configure-flags
--
2.29.2
?