bpf: test with GCC BPF compiler on opensuse

diff --git a/meson.build b/meson.build
index dd5a0cff897a2bdd98212492dfc7571698a25b6a..8262f5ff76b592fc7bc1ecefc0b741c2a932e99c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1135,6 +1135,7 @@ else
                 endif
         elif bpf_compiler == 'gcc'
                 bpf_gcc = find_program('bpf-gcc',
+                                       'bpf-none-gcc',
                                        required : true,
                                        version : '>= 13.1.0')
                 bpf_gcc_found = bpf_gcc.found()

diff --git a/mkosi.presets/00-base/mkosi.build b/mkosi.presets/00-base/mkosi.build
index 627df806843b1ce4c559fa5b72243728564048ef..11e8b1c812c604348fe7f7148659be75068ed76e 100755 (executable)
--- a/mkosi.presets/00-base/mkosi.build
+++ b/mkosi.presets/00-base/mkosi.build
@@ -176,6 +176,12 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then
         )
     fi
 
+    if grep -q '^ID="opensuse' /etc/os-release; then
+        CONFIGURE_OPTS+=(
+            -Dbpf-compiler=gcc
+        )
+    fi
+
     ( set -x; meson setup "$BUILDDIR" "${CONFIGURE_OPTS[@]}" )
 fi
 

diff --git a/mkosi.presets/00-base/mkosi.conf.d/10-opensuse.conf b/mkosi.presets/00-base/mkosi.conf.d/10-opensuse.conf
index c5c44b8df86f978c54faaedae96f0cf7bf7bfaa1..d4cdef12a45853bc6945ed4dae497d18cf9fede4 100644 (file)
--- a/mkosi.presets/00-base/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi.presets/00-base/mkosi.conf.d/10-opensuse.conf
@@ -36,6 +36,7 @@ Packages=
 BuildPackages=
         audit-devel
         bpftool
+        cross-bpf-gcc13
         dbus-1-devel
         docbook-xsl-stylesheets
         fdupes