[PATCH 0/2] gnu: bcc: Update to 0.18.0.

  • Done
  • quality assurance status badge
Details
2 participants
  • Greg Hogan
  • Efraim Flashner
Owner
unassigned
Submitted by
Greg Hogan
Severity
normal
G
G
Greg Hogan wrote on 13 Jan 2021 16:14
(address . guix-patches@gnu.org)
CA+3U0ZmJ10FibqCuMY_iOGgqcSpN1DEmntHhvpTVUZn=90_MOg@mail.gmail.com
bcc update depends on updated libbpf.
Attachment: file
G
G
Greg Hogan wrote on 13 Jan 2021 16:19
[PATCH 1/2] gnu: libbpf: Update to 0.3.
(address . 45843@debbugs.gnu.org)
CA+3U0Zm=cHNsZ2gA7G7eWYtjjWZ1FeZvwySuSN+Bt2aQZeb5UQ@mail.gmail.com
From dc8b0a99a9aece0a86406df963b3d4b5d887d482 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Tue, 12 Jan 2021 19:56:31 +0000
Subject: [PATCH 1/2] gnu: libbpf: Update to 0.3.

* gnu/packages/linux.scm (libbpf): Update to 0.3.
[arguments]: Remove obsolete deletion.
---
gnu/packages/linux.scm | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

Toggle diff (43 lines)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b16b3b7adb..29b6f44ba6 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -49,7 +49,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Anders Thuné <asse.97@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2020 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2020 David Dashyan <mail@davie.li>
;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
@@ -7585,7 +7585,7 @@ persistent over reboots.")
(define-public libbpf
(package
(name "libbpf")
- (version "0.0.9")
+ (version "0.3")
(source
(origin
(method git-fetch)
@@ -7595,7 +7595,7 @@ persistent over reboots.")
(file-name (git-file-name name version))
(sha256
(base32
- "18l0gff7nm841mwhr7bc7x863xcyvwh58zl7mc0amnsjqlbrvqg7"))))
+ "1zw04rz2igywwj2rwxw6ffwa5rp3d6iz0xi7nv9lmq5gpzpm25di"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -7616,9 +7616,6 @@ persistent over reboots.")
(delete 'configure)
(add-before 'build 'pre-build
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "scripts/check-reallocarray.sh"
- (("/bin/rm" rm)
- (string-append (assoc-ref inputs "coreutils") rm)))
(chdir "src")
#t)))))
(home-page "https://github.com/libbpf/libbpf")
--
2.23.3
Attachment: file
Attachment: 0001-gnu-libbpf-Update-to-0.3.patch
G
G
Greg Hogan wrote on 13 Jan 2021 16:20
[PATCH 2/2] gnu: bcc: Update to 0.18.0.
(address . 45843@debbugs.gnu.org)
CA+3U0Zk+nbWgZg35c9_o_3Eh3oTKat2+mBTqFiCNYSDZq7oYkg@mail.gmail.com
From 347d6085929e4f01b9f6a57fe22aab98e3b50bb9 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Tue, 12 Jan 2021 19:56:57 +0000
Subject: [PATCH 2/2] gnu: bcc: Update to 0.18.0.

* gnu/packages/linux.scm (bcc): Update to 0.18.0.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 29b6f44ba6..1a0a0a42af 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7629,7 +7629,7 @@ headers.")
(define-public bcc
(package
(name "bcc")
- (version "0.15.0")
+ (version "0.18.0")
(source
(origin
(method git-fetch)
@@ -7639,7 +7639,7 @@ headers.")
(file-name (git-file-name name version))
(sha256
(base32
- "1d5j9zanffa1c7lpi5fcrdlx1n7hy86xl82fam2xqr0s41q4ipxw"))))
+ "1cxvawglph4510s8aga6xnq2xnv0rrnpchgj93j1xgzwipwnqr40"))))
(build-system cmake-build-system)
(native-inputs
`(("bison" ,bison)
--
2.23.3
Attachment: file
Attachment: 0002-gnu-bcc-Update-to-0.18.0.patch
E
E
Efraim Flashner wrote on 20 Jan 2021 10:06
Re: [bug#45843] [PATCH 0/2] gnu: bcc: Update to 0.18.0.
(name . Greg Hogan)(address . code@greghogan.com)(address . 45843@debbugs.gnu.org)
YAfygE+rv09aShq4@3900XT
These patches break bpftrace. I checked upstream and didn't see a newer
release than 0.11.4.

In file included from /tmp/guix-build-bpftrace-0.11.4.drv-0/bpftrace-0.11.4-checkout/src/btf.cpp:20:
/gnu/store/w9yqdg4v092cblkkbpwcpvyfpdppvn3r-libbpf-0.3/include/bpf/btf.h:125:14: error: ISO C++ forbids forward references to 'enum' types
enum btf_func_linkage linkage, int proto_type_id);
^
1 error generated.
make[2]: *** [src/CMakeFiles/bpftrace.dir/build.make:105: src/CMakeFiles/bpftrace.dir/btf.cpp.o] Error 1

--
Efraim Flashner <efraim@flashner.co.il> ????? ?????
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
-----BEGIN PGP SIGNATURE-----

iQIyBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmAH8oAACgkQQarn3Mo9
g1HWNg/4iu8gOJ7dh4Heh4Mjen6rzWXuPTq5QRwjcJRk7MJ7OaLEkkYtdlGwSEAB
QD2iNLaLe3PX7wiSE/4q4TEMd8KnXpi4ArZVUAwPtiBU3aW8S0C5RoaOBSEJq2yh
HdzFhuinGPC/r9phTxVQiUj8EFySSGnbBjFHh114yAFO8XSSvDGKcrj5qSR7nnW8
aoBcuju40kV5Alzu1Aq2syUsuaUVu82YKN4duOmWCLP6iH2W+M6pFkeDihVUinnH
ITvOmy06pYMjL1R4OsShaqXw3hv9LqeABJU67rffkQ28Tw02E+KE8VcNTGTvXQlQ
4OB1cdlYcTUsQg84OHeg2D+nwkvk6PElD6JvQ4vVNsfQ3rjjLI0UhcWXMLqMmf/j
Zx1BgEPxd2GiaLQXJsllO/jqoRI+Y+9BcXerdnuFQgHc+B2hR8EuLuznSHIcFbkg
BFkBqbN5/143SbxTpHg+kLjnrqkstUWLdFV6cxW15/qMQFHqV4bsiJ5z7b/ElBa9
C9VuXgtpwzK/HFbwB95ANXn8rVT3dFSA7F5EC4bZsTqIpIciSHP4wRLT5LQzipAX
9CNwydCj6Ay40GfpU3hxwz1FGxm4hQkIFoOC6jHbnSEOqJSp9yrsJ17a45t6Whfc
hhdU44wh9nDTQV1mv8Algb3gz/1uHcvvgtIY6iwIINPZagi6xg==
=K1G0
-----END PGP SIGNATURE-----


G
G
Greg Hogan wrote on 28 Jan 2021 18:03
(name . Efraim Flashner)(address . efraim@flashner.co.il)(address . 45843@debbugs.gnu.org)
CA+3U0Zkp41cSB-YjDJn1Q5fOeZQO1ohLy7N_5Cseq-=Xd+rDJw@mail.gmail.com
Thank you for verifying this. Is there a way to select and locally build a
full (but small) set of package dependents?

bpftrace, bcc, and libbpf only compile for me with libbpf 0.1.1 and bcc
0.16.0. New patches below and attached.


From a785056285c7cf4995ca905acb7317e25d7ec801 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Tue, 12 Jan 2021 19:56:31 +0000
Subject: [PATCH 1/2] gnu: libbpf: Update to 0.1.1.

* gnu/packages/linux.scm (libbpf): Update to 0.1.1.
[arguments]: Remove obsolete deletion.
---
gnu/packages/linux.scm | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

Toggle diff (103 lines)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 2735c67200..f22008dcbf 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -49,7 +49,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Anders Thuné <asse.97@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2020 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2020 David Dashyan <mail@davie.li>
;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
@@ -7587,7 +7587,7 @@ persistent over reboots.")
(define-public libbpf
(package
(name "libbpf")
- (version "0.0.9")
+ (version "0.1.1")
(source
(origin
(method git-fetch)
@@ -7597,7 +7597,7 @@ persistent over reboots.")
(file-name (git-file-name name version))
(sha256
(base32
- "18l0gff7nm841mwhr7bc7x863xcyvwh58zl7mc0amnsjqlbrvqg7"))))
+ "0ilnnm4q22f8fagwp8kb37licy4ks861i2iqh2djsypqhnxvx3fv"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -7618,9 +7618,6 @@ persistent over reboots.")
(delete 'configure)
(add-before 'build 'pre-build
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "scripts/check-reallocarray.sh"
- (("/bin/rm" rm)
- (string-append (assoc-ref inputs "coreutils") rm)))
(chdir "src")
#t)))))
(home-page "https://github.com/libbpf/libbpf")
--
2.30.0



From 480ebd33111e1a85e3855974ebbd87ecbd6c6f25 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Tue, 12 Jan 2021 19:56:57 +0000
Subject: [PATCH 2/2] gnu: bcc: Update to 0.16.0.

* gnu/packages/linux.scm (bcc): Update to 0.16.0.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f22008dcbf..6066a7a4c8 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7631,7 +7631,7 @@ headers.")
(define-public bcc
(package
(name "bcc")
- (version "0.15.0")
+ (version "0.16.0")
(source
(origin
(method git-fetch)
@@ -7641,7 +7641,7 @@ headers.")
(file-name (git-file-name name version))
(sha256
(base32
- "1d5j9zanffa1c7lpi5fcrdlx1n7hy86xl82fam2xqr0s41q4ipxw"))))
+ "1367c0bzrpclvjvmk0sxgi49rh7j2f9izqk5a7g3yvawh1fmvvjh"))))
(build-system cmake-build-system)
(native-inputs
`(("bison" ,bison)
--
2.30.0

On Wed, Jan 20, 2021 at 4:06 AM Efraim Flashner <efraim@flashner.co.il>
wrote:

> These patches break bpftrace. I checked upstream and didn't see a newer
> release than 0.11.4.
>
> In file included from
> /tmp/guix-build-bpftrace-0.11.4.drv-0/bpftrace-0.11.4-checkout/src/btf.cpp:20:
> /gnu/store/w9yqdg4v092cblkkbpwcpvyfpdppvn3r-libbpf-0.3/include/bpf/btf.h:125:14:
> error: ISO C++ forbids forward references to 'enum' types
> enum btf_func_linkage linkage, int
> proto_type_id);
> ^
> 1 error generated.
> make[2]: *** [src/CMakeFiles/bpftrace.dir/build.make:105:
> src/CMakeFiles/bpftrace.dir/btf.cpp.o] Error 1
>
> --
> Efraim Flashner <efraim@flashner.co.il> ????? ?????
> GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted
>
Attachment: file
Attachment: 0001-gnu-libbpf-Update-to-0.1.1.patch
E
E
Efraim Flashner wrote on 28 Jan 2021 19:28
(name . Greg Hogan)(address . code@greghogan.com)(address . 45843-done@debbugs.gnu.org)
YBMCOLiCqlO7Urxk@3900XT
On Thu, Jan 28, 2021 at 12:03:57PM -0500, Greg Hogan wrote:
Toggle quote (3 lines)
> Thank you for verifying this. Is there a way to select and locally build a
> full (but small) set of package dependents?

I have a script I use that uses fold-packages to find the packages which
directly have a specific package as an input. I'm trying to get it to
work with inputs, but for now I manually edit it to add the package and
run it guile. I've attached it.

Toggle quote (3 lines)
> bpftrace, bcc, and libbpf only compile for me with libbpf 0.1.1 and bcc
> 0.16.0. New patches below and attached.

Thanks, it all looks good now. Patches pushed.

--
Efraim Flashner <efraim@flashner.co.il> ????? ?????
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
;#!/run/current-system/profile/bin/guile -e main -s #!/run/current-system/profile/bin/guile -s !# (use-modules (gnu packages) (guix packages) (srfi srfi-1) (srfi srfi-26)) (fold-packages (lambda (package _) (when (any (cut eq? <> (specification->package "clisp")) (map second (package-direct-inputs package))) (format #t "~a " (package-full-name package)))) #t) ;(define (main input) ; (display ; (fold-packages ; (lambda (package _) ; (when (any (cut eq? <> (specification->package (cadr input))) ; (map second (package-direct-inputs package))) ; (package-full-name package))) ; #t))) (newline)
-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmATAjgACgkQQarn3Mo9
g1GeDRAAww7OQD29OEEzF6o0FptxOHziYCz5FrwHf0h6UC84zjCPJfv4tIXB7P8p
5XIk3XNrXTFLQ1b6INsFB1xhw96ohrv1VJCLZ/fjPNB/oKPE6T7DLdNWs+iS7HUB
KAJiX16CSjoxbHL6hdJLQv38cZFx5XDCinS59411vPY5s0kPmCx3M+bEmwU73ses
JWKIshyK7hVNYAVTU/oAjDAX+CIxB5uBs0PlRXI3T3YlC2aOZ/ExEGvZ1dd0kKMC
1EPBlcGWMNSuU1lT3WpQWgr039SLQYWbKnP9cbNa+l8oRezb1Kl4rD7olrjiZClo
PlnlC6c8VGOpZ7dg4Ou2dEQmYp1hULAxL+dO4r+XyIOoC11je25z4P9bvKRxYOuE
Zojh3n3PCL3pk8NOgmMOOY7kTHHKvFNdtv1BLdzWcRFCFucOuD9/88PqHwr0YjU8
+Xl3SueMtYzA9YjN0nn+dtcSVkD6PgJuAtXcPvlZjE+3EldF+tSePfKlJS1/sHzN
QDDHbOzl2bYrQiFifXWY1k4dGY5xom5f7tnuXqr2lamioDbzMhOglKogL6lCao2b
mH96CgzkBej2Ju/Xr1895GuPAEsw3XF6iJ3sdwA0ZJ1IggZghrFcJxtBSzQYtedw
vYRBGvUPuen1XKeQjLh90tdTC+/xiY19QN8EFC73RDk/851HmUY=
=GDuB
-----END PGP SIGNATURE-----


Closed
?