From 27b93b8d254212c1249540d74f600850023faef7 Mon Sep 17 00:00:00 2001 From: Patrick Ferris Date: Fri, 1 Aug 2025 11:08:55 +0100 Subject: [PATCH] Update libbpf and bpftool for alpine and nix --- packages/conf-bpftool/conf-bpftool.0.1.0/opam | 4 +++- packages/libbpf/libbpf.0.1.0/opam | 11 ++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/conf-bpftool/conf-bpftool.0.1.0/opam b/packages/conf-bpftool/conf-bpftool.0.1.0/opam index 45097dd917a6..da8067f167fc 100644 --- a/packages/conf-bpftool/conf-bpftool.0.1.0/opam +++ b/packages/conf-bpftool/conf-bpftool.0.1.0/opam @@ -10,7 +10,9 @@ available: [ os = "linux" ] depexts: [ [ "linux-tools-common" ] {os-distribution = "ubuntu"} [ "bpftool" ] {os-distribution = "debian"} - [ "bpftool" ] {os-family = "fedora"} + [ "bpftool" ] {os-family = "fedora"} + [ "bpftools" ] {os-distribution = "nixos"} + [ "bpftool" ] {os-distribution = "alpine"} ] flags: conf x-commit-hash: "c7ac4c7ff9f2aa23c374a619990c0bdd78976102" \ No newline at end of file diff --git a/packages/libbpf/libbpf.0.1.0/opam b/packages/libbpf/libbpf.0.1.0/opam index 0cc023c41946..d7d7f730eba6 100644 --- a/packages/libbpf/libbpf.0.1.0/opam +++ b/packages/libbpf/libbpf.0.1.0/opam @@ -37,11 +37,12 @@ dev-repo: "git+https://github.com/koonwen/ocaml-libbpf.git" # eBPF features by kernel version https://github.com/iovisor/bcc/blob/master/docs/kernel-versions.md # Fix to kernel >= 6.1 to provide bound BPF map types available: [ os = "linux" & - (( os-distribution = "debian" & os-version >= "12" ) # Linux 6.1 & Libbpf 1.1.0 - |( os-distribution = "ubuntu" & os-version >= "23.04" ) # Linux 6.2 & Libbpf 1.1.0 - |( os-family = "fedora" & os-version >= "38" ) # Linux 6.2 & Libbpf 1.1.0 - |( os-distribution = "nixos" & os-version >= "23.05" )) # Linux 6.1 & Libbpf 1.1.0 - ] + (( os-distribution = "debian" & os-version >= "12" ) # Linux 6.1 & Libbpf 1.1.0 + |( os-distribution = "ubuntu" & os-version >= "23.04" ) # Linux 6.2 & Libbpf 1.1.0 + |( os-family = "fedora" & os-version >= "38" ) # Linux 6.2 & Libbpf 1.1.0 + |( os-distribution = "nixos" & os-version >= "23.05" ) # Linux 6.1 & Libbpf 1.1.0 + |( os-distribution = "alpine" & os-version >= "3.18")) # Linux 6.1 & Libbpf 1.2.2 + ] url { src: "https://github.com/koonwen/ocaml-libbpf/releases/download/v0.1.0/libbpf-0.1.0.tbz"