[-- Attachment #1: Type: text/plain, Size: 38 bytes --] bcc update depends on updated libbpf. [-- Attachment #2: Type: text/html, Size: 80 bytes --]
[-- Attachment #1.1: Type: text/plain, Size: 2088 bytes --] 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(-) 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 #1.2: Type: text/html, Size: 3343 bytes --] [-- Attachment #2: 0001-gnu-libbpf-Update-to-0.3.patch --] [-- Type: application/octet-stream, Size: 2035 bytes --] 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(-) 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 #1.1: Type: text/plain, Size: 1022 bytes --] 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(-) 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 #1.2: Type: text/html, Size: 1583 bytes --] [-- Attachment #2: 0002-gnu-bcc-Update-to-0.18.0.patch --] [-- Type: application/octet-stream, Size: 1023 bytes --] 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(-) 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 #1: Type: text/plain, Size: 796 bytes --] 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 #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #1.1: Type: text/plain, Size: 4318 bytes --] 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(-) 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 #1.2: Type: text/html, Size: 7592 bytes --] [-- Attachment #2: 0001-gnu-libbpf-Update-to-0.1.1.patch --] [-- Type: application/octet-stream, Size: 2041 bytes --] 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(-) 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
[-- Attachment #1.1: Type: text/plain, Size: 822 bytes --] On Thu, Jan 28, 2021 at 12:03:57PM -0500, Greg Hogan wrote: > 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. > 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 [-- Attachment #1.2: direct-dependants.scm --] [-- Type: text/plain, Size: 684 bytes --] ;#!/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) [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]