From 13a86b4d9ffbcf2f1300d35ce622513152078c38 Mon Sep 17 00:00:00 2001 From: DaanDeMeyer Date: Sun, 13 Jul 2025 12:39:38 +0200 Subject: [PATCH 1/4] workflows: Use hyphens in filenames instead of underscores --- .github/workflows/{build_test.sh => build-test.sh} | 0 .github/workflows/{build_test.yml => build-test.yml} | 2 +- .github/workflows/{cflite_pr.yml => cflite-pr.yml} | 0 .github/workflows/codeql.yml | 2 +- .github/workflows/coverity.yml | 2 +- .../{development_freeze.yml => development-freeze.yml} | 0 .github/workflows/{issue_labeler.yml => issue-labeler.yml} | 0 .github/workflows/{make_release.yml => make-release.yml} | 0 .github/workflows/{unit_tests.sh => unit-tests.sh} | 0 .github/workflows/{unit_tests.yml => unit-tests.yml} | 4 ++-- 10 files changed, 5 insertions(+), 5 deletions(-) rename .github/workflows/{build_test.sh => build-test.sh} (100%) rename .github/workflows/{build_test.yml => build-test.yml} (96%) rename .github/workflows/{cflite_pr.yml => cflite-pr.yml} (100%) rename .github/workflows/{development_freeze.yml => development-freeze.yml} (100%) rename .github/workflows/{issue_labeler.yml => issue-labeler.yml} (100%) rename .github/workflows/{make_release.yml => make-release.yml} (100%) rename .github/workflows/{unit_tests.sh => unit-tests.sh} (100%) rename .github/workflows/{unit_tests.yml => unit-tests.yml} (95%) diff --git a/.github/workflows/build_test.sh b/.github/workflows/build-test.sh similarity index 100% rename from .github/workflows/build_test.sh rename to .github/workflows/build-test.sh diff --git a/.github/workflows/build_test.yml b/.github/workflows/build-test.yml similarity index 96% rename from .github/workflows/build_test.yml rename to .github/workflows/build-test.yml index fc96cd98c3..54c396fce6 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build-test.yml @@ -41,4 +41,4 @@ jobs: - name: Repository checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Build check - run: .github/workflows/build_test.sh + run: .github/workflows/build-test.sh diff --git a/.github/workflows/cflite_pr.yml b/.github/workflows/cflite-pr.yml similarity index 100% rename from .github/workflows/cflite_pr.yml rename to .github/workflows/cflite-pr.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ad3a80a14c..dacc1b5b81 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -50,7 +50,7 @@ jobs: languages: ${{ matrix.language }} config-file: ./.github/codeql-config.yml - - run: sudo -E .github/workflows/unit_tests.sh SETUP + - run: sudo -E .github/workflows/unit-tests.sh SETUP - name: Autobuild uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 66204069c4..b77a1a1390 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -25,6 +25,6 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # Reuse the setup phase of the unit test script to avoid code duplication - name: Install build dependencies - run: sudo -E .github/workflows/unit_tests.sh SETUP + run: sudo -E .github/workflows/unit-tests.sh SETUP - name: Build & upload the results run: tools/coverity.sh diff --git a/.github/workflows/development_freeze.yml b/.github/workflows/development-freeze.yml similarity index 100% rename from .github/workflows/development_freeze.yml rename to .github/workflows/development-freeze.yml diff --git a/.github/workflows/issue_labeler.yml b/.github/workflows/issue-labeler.yml similarity index 100% rename from .github/workflows/issue_labeler.yml rename to .github/workflows/issue-labeler.yml diff --git a/.github/workflows/make_release.yml b/.github/workflows/make-release.yml similarity index 100% rename from .github/workflows/make_release.yml rename to .github/workflows/make-release.yml diff --git a/.github/workflows/unit_tests.sh b/.github/workflows/unit-tests.sh similarity index 100% rename from .github/workflows/unit_tests.sh rename to .github/workflows/unit-tests.sh diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit-tests.yml similarity index 95% rename from .github/workflows/unit_tests.yml rename to .github/workflows/unit-tests.yml index a7b71a60de..e92430274e 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit-tests.yml @@ -44,6 +44,6 @@ jobs: sudo sed -i '/^XDG_/d' /etc/environment # Pass only specific env variables through sudo, to avoid having # the already existing XDG_* stuff on the "other side" - sudo --preserve-env=GITHUB_ACTIONS,CI .github/workflows/unit_tests.sh SETUP + sudo --preserve-env=GITHUB_ACTIONS,CI .github/workflows/unit-tests.sh SETUP - name: Build & test - run: sudo --preserve-env=GITHUB_ACTIONS,CI .github/workflows/unit_tests.sh RUN_${{ matrix.run_phase }} + run: sudo --preserve-env=GITHUB_ACTIONS,CI .github/workflows/unit-tests.sh RUN_${{ matrix.run_phase }} From 47f761fda6dee8499e4ff0995af7ac7248e205fd Mon Sep 17 00:00:00 2001 From: DaanDeMeyer Date: Sun, 13 Jul 2025 12:39:58 +0200 Subject: [PATCH 2/4] basic: Use hyphens in missing header names instead of underscores --- src/basic/{missing_drm.h => missing-drm.h} | 0 src/basic/{missing_network.h => missing-network.h} | 0 src/basic/parse-util.c | 2 +- src/basic/socket-util.h | 2 +- src/libsystemd/sd-netlink/netlink-types-genl.c | 2 +- src/libsystemd/sd-netlink/netlink-types-rtnl.c | 2 +- src/libsystemd/sd-netlink/test-netlink.c | 2 +- src/login/logind-session-device.c | 2 +- src/network/netdev/tunnel.c | 2 +- src/network/netdev/xfrm.c | 2 +- src/network/networkd-ndisc.c | 2 +- src/network/networkd-netlabel.c | 2 +- src/network/networkd-setlink.c | 2 +- src/resolve/resolvectl.c | 2 +- src/resolve/resolved-dns-stream.c | 2 +- src/resolve/resolved-dns-stub.c | 2 +- src/resolve/resolved-dns-synthesize.c | 2 +- src/resolve/resolved-manager.c | 2 +- src/shared/conf-parser.c | 2 +- src/shared/loopback-setup.c | 2 +- src/test/test-socket-netlink.c | 2 +- 21 files changed, 19 insertions(+), 19 deletions(-) rename src/basic/{missing_drm.h => missing-drm.h} (100%) rename src/basic/{missing_network.h => missing-network.h} (100%) diff --git a/src/basic/missing_drm.h b/src/basic/missing-drm.h similarity index 100% rename from src/basic/missing_drm.h rename to src/basic/missing-drm.h diff --git a/src/basic/missing_network.h b/src/basic/missing-network.h similarity index 100% rename from src/basic/missing_network.h rename to src/basic/missing-network.h diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c index dfe311b043..db770080b2 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c @@ -11,7 +11,7 @@ #include "extract-word.h" #include "locale-util.h" #include "log.h" -#include "missing_network.h" +#include "missing-network.h" #include "parse-util.h" #include "process-util.h" #include "string-util.h" diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h index 24883d2db2..46f5ff3eae 100644 --- a/src/basic/socket-util.h +++ b/src/basic/socket-util.h @@ -12,7 +12,7 @@ #include "forward.h" #include "memory-util.h" -#include "missing_network.h" +#include "missing-network.h" union sockaddr_union { /* The minimal, abstract version */ diff --git a/src/libsystemd/sd-netlink/netlink-types-genl.c b/src/libsystemd/sd-netlink/netlink-types-genl.c index 422ae7e691..e97d901223 100644 --- a/src/libsystemd/sd-netlink/netlink-types-genl.c +++ b/src/libsystemd/sd-netlink/netlink-types-genl.c @@ -11,7 +11,7 @@ #include #include -#include "missing_network.h" +#include "missing-network.h" #include "netlink-genl.h" #include "netlink-types-internal.h" diff --git a/src/libsystemd/sd-netlink/netlink-types-rtnl.c b/src/libsystemd/sd-netlink/netlink-types-rtnl.c index 4dc98f0504..cf71754f4c 100644 --- a/src/libsystemd/sd-netlink/netlink-types-rtnl.c +++ b/src/libsystemd/sd-netlink/netlink-types-rtnl.c @@ -19,7 +19,7 @@ #include #include -#include "missing_network.h" +#include "missing-network.h" #include "netlink-types-internal.h" enum { diff --git a/src/libsystemd/sd-netlink/test-netlink.c b/src/libsystemd/sd-netlink/test-netlink.c index cb11448e4c..2a7fb255b0 100644 --- a/src/libsystemd/sd-netlink/test-netlink.c +++ b/src/libsystemd/sd-netlink/test-netlink.c @@ -17,7 +17,7 @@ #include "alloc-util.h" #include "fd-util.h" -#include "missing_network.h" +#include "missing-network.h" #include "netlink-genl.h" #include "netlink-internal.h" #include "netlink-sock-diag.h" diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index 44efb56d22..7129f823e8 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -22,7 +22,7 @@ #include "logind-session.h" #include "logind-session-dbus.h" #include "logind-session-device.h" -#include "missing_drm.h" +#include "missing-drm.h" #include "string-util.h" enum SessionDeviceNotifications { diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index 5c795337a2..211388bb95 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -10,7 +10,7 @@ #include "alloc-util.h" #include "conf-parser.h" #include "hexdecoct.h" -#include "missing_network.h" +#include "missing-network.h" #include "netlink-util.h" #include "networkd-manager.h" #include "parse-util.h" diff --git a/src/network/netdev/xfrm.c b/src/network/netdev/xfrm.c index 07015a9434..f616198371 100644 --- a/src/network/netdev/xfrm.c +++ b/src/network/netdev/xfrm.c @@ -4,7 +4,7 @@ #include "sd-netlink.h" -#include "missing_network.h" +#include "missing-network.h" #include "networkd-link.h" #include "xfrm.h" diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index f0d5acfa50..b985dc29de 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -12,7 +12,7 @@ #include "conf-parser.h" #include "errno-util.h" #include "event-util.h" -#include "missing_network.h" +#include "missing-network.h" #include "ndisc-router-internal.h" #include "networkd-address.h" #include "networkd-address-generation.h" diff --git a/src/network/networkd-netlabel.c b/src/network/networkd-netlabel.c index 7ba21bbdda..8a2d23be61 100644 --- a/src/network/networkd-netlabel.c +++ b/src/network/networkd-netlabel.c @@ -2,7 +2,7 @@ #include "sd-netlink.h" -#include "missing_network.h" +#include "missing-network.h" #include "netlink-util.h" #include "networkd-address.h" #include "networkd-link.h" diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c index bdde9d6c25..ed51ecdd79 100644 --- a/src/network/networkd-setlink.c +++ b/src/network/networkd-setlink.c @@ -7,7 +7,7 @@ #include "sd-netlink.h" #include "device-private.h" -#include "missing_network.h" +#include "missing-network.h" #include "netif-util.h" #include "netlink-util.h" #include "networkd-address.h" diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c index f6708cdead..8bf0ee533f 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c @@ -30,7 +30,7 @@ #include "hostname-util.h" #include "json-util.h" #include "main-func.h" -#include "missing_network.h" +#include "missing-network.h" #include "netlink-util.h" #include "openssl-util.h" #include "pager.h" diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c index 728c3f7620..60d2b831c7 100644 --- a/src/resolve/resolved-dns-stream.c +++ b/src/resolve/resolved-dns-stream.c @@ -9,7 +9,7 @@ #include "fd-util.h" #include "iovec-util.h" #include "log.h" -#include "missing_network.h" +#include "missing-network.h" #include "ordered-set.h" #include "resolved-dns-packet.h" #include "resolved-dns-server.h" diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c index 11710b8a48..655a6c5da1 100644 --- a/src/resolve/resolved-dns-stub.c +++ b/src/resolve/resolved-dns-stub.c @@ -11,7 +11,7 @@ #include "errno-util.h" #include "fd-util.h" #include "log.h" -#include "missing_network.h" +#include "missing-network.h" #include "resolve-util.h" #include "resolved-dns-answer.h" #include "resolved-dns-packet.h" diff --git a/src/resolve/resolved-dns-synthesize.c b/src/resolve/resolved-dns-synthesize.c index c549856b93..882bacc97a 100644 --- a/src/resolve/resolved-dns-synthesize.c +++ b/src/resolve/resolved-dns-synthesize.c @@ -7,7 +7,7 @@ #include "hostname-util.h" #include "local-addresses.h" #include "log.h" -#include "missing_network.h" +#include "missing-network.h" #include "resolved-def.h" #include "resolved-dns-answer.h" #include "resolved-dns-packet.h" diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index d4eb6b8c0a..335698c9b1 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -24,7 +24,7 @@ #include "iovec-util.h" #include "json-util.h" #include "memstream-util.h" -#include "missing_network.h" +#include "missing-network.h" #include "ordered-set.h" #include "parse-util.h" #include "random-util.h" diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index dc9561f962..fb56c6e641 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -24,7 +24,7 @@ #include "in-addr-prefix-util.h" #include "ip-protocol-list.h" #include "log.h" -#include "missing_network.h" +#include "missing-network.h" #include "nulstr-util.h" #include "parse-helpers.h" #include "parse-util.h" diff --git a/src/shared/loopback-setup.c b/src/shared/loopback-setup.c index a2fd14d507..47a3275ee3 100644 --- a/src/shared/loopback-setup.c +++ b/src/shared/loopback-setup.c @@ -7,7 +7,7 @@ #include "errno-util.h" #include "log.h" #include "loopback-setup.h" -#include "missing_network.h" +#include "missing-network.h" #include "time-util.h" #define LOOPBACK_SETUP_TIMEOUT_USEC (5 * USEC_PER_SEC) diff --git a/src/test/test-socket-netlink.c b/src/test/test-socket-netlink.c index 9313439cf5..4ed85b431c 100644 --- a/src/test/test-socket-netlink.c +++ b/src/test/test-socket-netlink.c @@ -4,7 +4,7 @@ #include "alloc-util.h" #include "fd-util.h" -#include "missing_network.h" +#include "missing-network.h" #include "socket-netlink.h" #include "socket-util.h" #include "string-util.h" From d962bfeb0354cd5dacc92aaac50ec6d7bed2917b Mon Sep 17 00:00:00 2001 From: DaanDeMeyer Date: Sun, 13 Jul 2025 12:41:57 +0200 Subject: [PATCH 3/4] boot: Use hypen in efi-config.h instead of underscore --- src/boot/meson.build | 4 ++-- src/test/test-sbat.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/boot/meson.build b/src/boot/meson.build index 4064bbe3b7..68f1432d1d 100644 --- a/src/boot/meson.build +++ b/src/boot/meson.build @@ -147,7 +147,7 @@ if efi_conf.get('SBAT_DISTRO', '') != '' endif configure_file( - output : 'efi_config.h', + output : 'efi-config.h', configuration : efi_conf) ############################################################ @@ -163,7 +163,7 @@ efi_c_args = [ '-ffreestanding', '-fno-strict-aliasing', '-fshort-wchar', - '-include', 'efi_config.h', + '-include', 'efi-config.h', ] efi_c_args += cc.get_supported_arguments( diff --git a/src/test/test-sbat.c b/src/test/test-sbat.c index 47b31ba5d3..a085953c28 100644 --- a/src/test/test-sbat.c +++ b/src/test/test-sbat.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* We include efi_config.h after undefining PROJECT_VERSION which is also defined in config.h. */ +/* We include efi-config.h after undefining PROJECT_VERSION which is also defined in config.h. */ #undef PROJECT_VERSION -#include "efi_config.h" +#include "efi-config.h" #include "sbat.h" #include "tests.h" From f4df5902d83a6c4bc7b68a16dd0846888d7cbdb2 Mon Sep 17 00:00:00 2001 From: DaanDeMeyer Date: Sun, 13 Jul 2025 12:45:37 +0200 Subject: [PATCH 4/4] bpf: Use hyphens in directory names instead of underscores --- src/core/bpf-restrict-fs.c | 2 +- src/core/bpf-restrict-ifaces.c | 2 +- src/core/bpf-socket-bind.c | 4 ++-- src/core/bpf/{restrict_fs => restrict-fs}/meson.build | 0 .../bpf/{restrict_fs => restrict-fs}/restrict-fs-skel.h | 2 +- src/core/bpf/{restrict_fs => restrict-fs}/restrict-fs.bpf.c | 0 .../bpf/{restrict_ifaces => restrict-ifaces}/meson.build | 0 .../restrict-ifaces-skel.h | 2 +- .../restrict-ifaces.bpf.c | 0 src/core/bpf/{socket_bind => socket-bind}/meson.build | 0 .../bpf/{socket_bind => socket-bind}/socket-bind-api.bpf.h | 0 .../bpf/{socket_bind => socket-bind}/socket-bind-skel.h | 2 +- src/core/bpf/{socket_bind => socket-bind}/socket-bind.bpf.c | 0 src/core/cgroup.c | 2 +- src/core/meson.build | 6 +++--- .../bpf/{sysctl_monitor => sysctl-monitor}/meson.build | 0 .../sysctl-monitor-skel.h | 2 +- .../{sysctl_monitor => sysctl-monitor}/sysctl-monitor.bpf.c | 0 .../{sysctl_monitor => sysctl-monitor}/sysctl-write-event.h | 0 src/network/meson.build | 2 +- src/network/networkd-sysctl.c | 4 ++-- .../bpf/{userns_restrict => userns-restrict}/meson.build | 0 .../userns-restrict-skel.h | 2 +- .../userns-restrict.bpf.c | 0 src/nsresourced/meson.build | 2 +- src/nsresourced/userns-restrict.h | 2 +- src/shared/bpf-dlopen.h | 2 +- 27 files changed, 19 insertions(+), 19 deletions(-) rename src/core/bpf/{restrict_fs => restrict-fs}/meson.build (100%) rename src/core/bpf/{restrict_fs => restrict-fs}/restrict-fs-skel.h (93%) rename src/core/bpf/{restrict_fs => restrict-fs}/restrict-fs.bpf.c (100%) rename src/core/bpf/{restrict_ifaces => restrict-ifaces}/meson.build (100%) rename src/core/bpf/{restrict_ifaces => restrict-ifaces}/restrict-ifaces-skel.h (91%) rename src/core/bpf/{restrict_ifaces => restrict-ifaces}/restrict-ifaces.bpf.c (100%) rename src/core/bpf/{socket_bind => socket-bind}/meson.build (100%) rename src/core/bpf/{socket_bind => socket-bind}/socket-bind-api.bpf.h (100%) rename src/core/bpf/{socket_bind => socket-bind}/socket-bind-skel.h (93%) rename src/core/bpf/{socket_bind => socket-bind}/socket-bind.bpf.c (100%) rename src/network/bpf/{sysctl_monitor => sysctl-monitor}/meson.build (100%) rename src/network/bpf/{sysctl_monitor => sysctl-monitor}/sysctl-monitor-skel.h (92%) rename src/network/bpf/{sysctl_monitor => sysctl-monitor}/sysctl-monitor.bpf.c (100%) rename src/network/bpf/{sysctl_monitor => sysctl-monitor}/sysctl-write-event.h (100%) rename src/nsresourced/bpf/{userns_restrict => userns-restrict}/meson.build (100%) rename src/nsresourced/bpf/{userns_restrict => userns-restrict}/userns-restrict-skel.h (92%) rename src/nsresourced/bpf/{userns_restrict => userns-restrict}/userns-restrict.bpf.c (100%) diff --git a/src/core/bpf-restrict-fs.c b/src/core/bpf-restrict-fs.c index 33e525c911..859ba556a0 100644 --- a/src/core/bpf-restrict-fs.c +++ b/src/core/bpf-restrict-fs.c @@ -17,7 +17,7 @@ /* libbpf, clang and llc compile time dependencies are satisfied */ #include "bpf-dlopen.h" #include "bpf-link.h" -#include "bpf/restrict_fs/restrict-fs-skel.h" +#include "bpf/restrict-fs/restrict-fs-skel.h" #define CGROUP_HASH_SIZE_MAX 2048 diff --git a/src/core/bpf-restrict-ifaces.c b/src/core/bpf-restrict-ifaces.c index 971772bade..dc8b976b7f 100644 --- a/src/core/bpf-restrict-ifaces.c +++ b/src/core/bpf-restrict-ifaces.c @@ -16,7 +16,7 @@ #include "bpf-dlopen.h" #include "bpf-link.h" -#include "bpf/restrict_ifaces/restrict-ifaces-skel.h" +#include "bpf/restrict-ifaces/restrict-ifaces-skel.h" static struct restrict_ifaces_bpf *restrict_ifaces_bpf_free(struct restrict_ifaces_bpf *obj) { restrict_ifaces_bpf__destroy(obj); diff --git a/src/core/bpf-socket-bind.c b/src/core/bpf-socket-bind.c index 6838476d04..1fc73c19ab 100644 --- a/src/core/bpf-socket-bind.c +++ b/src/core/bpf-socket-bind.c @@ -11,8 +11,8 @@ /* libbpf, clang, llvm and bpftool compile time dependencies are satisfied */ #include "bpf-dlopen.h" #include "bpf-link.h" -#include "bpf/socket_bind/socket-bind-api.bpf.h" -#include "bpf/socket_bind/socket-bind-skel.h" +#include "bpf/socket-bind/socket-bind-api.bpf.h" +#include "bpf/socket-bind/socket-bind-skel.h" static struct socket_bind_bpf *socket_bind_bpf_free(struct socket_bind_bpf *obj) { /* socket_bind_bpf__destroy handles object == NULL case */ diff --git a/src/core/bpf/restrict_fs/meson.build b/src/core/bpf/restrict-fs/meson.build similarity index 100% rename from src/core/bpf/restrict_fs/meson.build rename to src/core/bpf/restrict-fs/meson.build diff --git a/src/core/bpf/restrict_fs/restrict-fs-skel.h b/src/core/bpf/restrict-fs/restrict-fs-skel.h similarity index 93% rename from src/core/bpf/restrict_fs/restrict-fs-skel.h rename to src/core/bpf/restrict-fs/restrict-fs-skel.h index 825b8131f9..51b15ae812 100644 --- a/src/core/bpf/restrict_fs/restrict-fs-skel.h +++ b/src/core/bpf/restrict-fs/restrict-fs-skel.h @@ -13,4 +13,4 @@ #define bpf_object__load_skeleton sym_bpf_object__load_skeleton #define bpf_object__destroy_skeleton sym_bpf_object__destroy_skeleton -#include "bpf/restrict_fs/restrict-fs.skel.h" +#include "bpf/restrict-fs/restrict-fs.skel.h" diff --git a/src/core/bpf/restrict_fs/restrict-fs.bpf.c b/src/core/bpf/restrict-fs/restrict-fs.bpf.c similarity index 100% rename from src/core/bpf/restrict_fs/restrict-fs.bpf.c rename to src/core/bpf/restrict-fs/restrict-fs.bpf.c diff --git a/src/core/bpf/restrict_ifaces/meson.build b/src/core/bpf/restrict-ifaces/meson.build similarity index 100% rename from src/core/bpf/restrict_ifaces/meson.build rename to src/core/bpf/restrict-ifaces/meson.build diff --git a/src/core/bpf/restrict_ifaces/restrict-ifaces-skel.h b/src/core/bpf/restrict-ifaces/restrict-ifaces-skel.h similarity index 91% rename from src/core/bpf/restrict_ifaces/restrict-ifaces-skel.h rename to src/core/bpf/restrict-ifaces/restrict-ifaces-skel.h index f0675f270b..fbebad688d 100644 --- a/src/core/bpf/restrict_ifaces/restrict-ifaces-skel.h +++ b/src/core/bpf/restrict-ifaces/restrict-ifaces-skel.h @@ -13,4 +13,4 @@ #define bpf_object__load_skeleton sym_bpf_object__load_skeleton #define bpf_object__destroy_skeleton sym_bpf_object__destroy_skeleton -#include "bpf/restrict_ifaces/restrict-ifaces.skel.h" +#include "bpf/restrict-ifaces/restrict-ifaces.skel.h" diff --git a/src/core/bpf/restrict_ifaces/restrict-ifaces.bpf.c b/src/core/bpf/restrict-ifaces/restrict-ifaces.bpf.c similarity index 100% rename from src/core/bpf/restrict_ifaces/restrict-ifaces.bpf.c rename to src/core/bpf/restrict-ifaces/restrict-ifaces.bpf.c diff --git a/src/core/bpf/socket_bind/meson.build b/src/core/bpf/socket-bind/meson.build similarity index 100% rename from src/core/bpf/socket_bind/meson.build rename to src/core/bpf/socket-bind/meson.build diff --git a/src/core/bpf/socket_bind/socket-bind-api.bpf.h b/src/core/bpf/socket-bind/socket-bind-api.bpf.h similarity index 100% rename from src/core/bpf/socket_bind/socket-bind-api.bpf.h rename to src/core/bpf/socket-bind/socket-bind-api.bpf.h diff --git a/src/core/bpf/socket_bind/socket-bind-skel.h b/src/core/bpf/socket-bind/socket-bind-skel.h similarity index 93% rename from src/core/bpf/socket_bind/socket-bind-skel.h rename to src/core/bpf/socket-bind/socket-bind-skel.h index c92eae002d..72d708dbfc 100644 --- a/src/core/bpf/socket_bind/socket-bind-skel.h +++ b/src/core/bpf/socket-bind/socket-bind-skel.h @@ -13,4 +13,4 @@ #define bpf_object__load_skeleton sym_bpf_object__load_skeleton #define bpf_object__destroy_skeleton sym_bpf_object__destroy_skeleton -#include "bpf/socket_bind/socket-bind.skel.h" +#include "bpf/socket-bind/socket-bind.skel.h" diff --git a/src/core/bpf/socket_bind/socket-bind.bpf.c b/src/core/bpf/socket-bind/socket-bind.bpf.c similarity index 100% rename from src/core/bpf/socket_bind/socket-bind.bpf.c rename to src/core/bpf/socket-bind/socket-bind.bpf.c diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 118fe988a6..4667d41ae3 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -54,7 +54,7 @@ #include "bpf-dlopen.h" #include "bpf-link.h" #include "bpf-restrict-fs.h" -#include "bpf/restrict_fs/restrict-fs-skel.h" +#include "bpf/restrict-fs/restrict-fs-skel.h" #endif #define CGROUP_CPU_QUOTA_DEFAULT_PERIOD_USEC (100 * USEC_PER_MSEC) diff --git a/src/core/meson.build b/src/core/meson.build index 991c3bb0d1..8bb0054c14 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -70,9 +70,9 @@ libcore_sources = files( 'varlink-unit.c', ) -subdir('bpf/socket_bind') -subdir('bpf/restrict_fs') -subdir('bpf/restrict_ifaces') +subdir('bpf/socket-bind') +subdir('bpf/restrict-fs') +subdir('bpf/restrict-ifaces') if conf.get('BPF_FRAMEWORK') == 1 libcore_sources += [ diff --git a/src/network/bpf/sysctl_monitor/meson.build b/src/network/bpf/sysctl-monitor/meson.build similarity index 100% rename from src/network/bpf/sysctl_monitor/meson.build rename to src/network/bpf/sysctl-monitor/meson.build diff --git a/src/network/bpf/sysctl_monitor/sysctl-monitor-skel.h b/src/network/bpf/sysctl-monitor/sysctl-monitor-skel.h similarity index 92% rename from src/network/bpf/sysctl_monitor/sysctl-monitor-skel.h rename to src/network/bpf/sysctl-monitor/sysctl-monitor-skel.h index d002414521..26ee294578 100644 --- a/src/network/bpf/sysctl_monitor/sysctl-monitor-skel.h +++ b/src/network/bpf/sysctl-monitor/sysctl-monitor-skel.h @@ -13,4 +13,4 @@ #define bpf_object__load_skeleton sym_bpf_object__load_skeleton #define bpf_object__open_skeleton sym_bpf_object__open_skeleton -#include "bpf/sysctl_monitor/sysctl-monitor.skel.h" +#include "bpf/sysctl-monitor/sysctl-monitor.skel.h" diff --git a/src/network/bpf/sysctl_monitor/sysctl-monitor.bpf.c b/src/network/bpf/sysctl-monitor/sysctl-monitor.bpf.c similarity index 100% rename from src/network/bpf/sysctl_monitor/sysctl-monitor.bpf.c rename to src/network/bpf/sysctl-monitor/sysctl-monitor.bpf.c diff --git a/src/network/bpf/sysctl_monitor/sysctl-write-event.h b/src/network/bpf/sysctl-monitor/sysctl-write-event.h similarity index 100% rename from src/network/bpf/sysctl_monitor/sysctl-write-event.h rename to src/network/bpf/sysctl-monitor/sysctl-write-event.h diff --git a/src/network/meson.build b/src/network/meson.build index 0c8dd46a67..c6a323c929 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -1,6 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -subdir('bpf/sysctl_monitor') +subdir('bpf/sysctl-monitor') systemd_networkd_sources = files( 'networkd.c' diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c index efb9f45df9..4f9b6522d7 100644 --- a/src/network/networkd-sysctl.c +++ b/src/network/networkd-sysctl.c @@ -29,8 +29,8 @@ #if HAVE_VMLINUX_H #include "bpf-link.h" -#include "bpf/sysctl_monitor/sysctl-monitor-skel.h" -#include "bpf/sysctl_monitor/sysctl-write-event.h" +#include "bpf/sysctl-monitor/sysctl-monitor-skel.h" +#include "bpf/sysctl-monitor/sysctl-write-event.h" static struct sysctl_monitor_bpf* sysctl_monitor_bpf_free(struct sysctl_monitor_bpf *obj) { sysctl_monitor_bpf__destroy(obj); diff --git a/src/nsresourced/bpf/userns_restrict/meson.build b/src/nsresourced/bpf/userns-restrict/meson.build similarity index 100% rename from src/nsresourced/bpf/userns_restrict/meson.build rename to src/nsresourced/bpf/userns-restrict/meson.build diff --git a/src/nsresourced/bpf/userns_restrict/userns-restrict-skel.h b/src/nsresourced/bpf/userns-restrict/userns-restrict-skel.h similarity index 92% rename from src/nsresourced/bpf/userns_restrict/userns-restrict-skel.h rename to src/nsresourced/bpf/userns-restrict/userns-restrict-skel.h index 271caf4662..a7cbeb8e75 100644 --- a/src/nsresourced/bpf/userns_restrict/userns-restrict-skel.h +++ b/src/nsresourced/bpf/userns-restrict/userns-restrict-skel.h @@ -14,4 +14,4 @@ #define bpf_object__load_skeleton sym_bpf_object__load_skeleton #define bpf_object__open_skeleton sym_bpf_object__open_skeleton -#include "bpf/userns_restrict/userns-restrict.skel.h" +#include "bpf/userns-restrict/userns-restrict.skel.h" diff --git a/src/nsresourced/bpf/userns_restrict/userns-restrict.bpf.c b/src/nsresourced/bpf/userns-restrict/userns-restrict.bpf.c similarity index 100% rename from src/nsresourced/bpf/userns_restrict/userns-restrict.bpf.c rename to src/nsresourced/bpf/userns-restrict/userns-restrict.bpf.c diff --git a/src/nsresourced/meson.build b/src/nsresourced/meson.build index 805a4788d0..31d334f811 100644 --- a/src/nsresourced/meson.build +++ b/src/nsresourced/meson.build @@ -4,7 +4,7 @@ if conf.get('ENABLE_NSRESOURCED') != 1 subdir_done() endif -subdir('bpf/userns_restrict') +subdir('bpf/userns-restrict') systemd_nsresourced_sources = files( 'nsresourced-manager.c', diff --git a/src/nsresourced/userns-restrict.h b/src/nsresourced/userns-restrict.h index d9c0f611ef..a1a29ba8f6 100644 --- a/src/nsresourced/userns-restrict.h +++ b/src/nsresourced/userns-restrict.h @@ -4,7 +4,7 @@ #include "forward.h" #if HAVE_VMLINUX_H -#include "bpf/userns_restrict/userns-restrict-skel.h" +#include "bpf/userns-restrict/userns-restrict-skel.h" #else struct userns_restrict_bpf; #endif diff --git a/src/shared/bpf-dlopen.h b/src/shared/bpf-dlopen.h index 639c112894..3a985738ec 100644 --- a/src/shared/bpf-dlopen.h +++ b/src/shared/bpf-dlopen.h @@ -26,7 +26,7 @@ extern DLSYM_PROTOTYPE(bpf_map_get_fd_by_id); extern DLSYM_PROTOTYPE(bpf_map_lookup_elem); extern DLSYM_PROTOTYPE(bpf_map_update_elem); /* The *_skeleton APIs are autogenerated by bpftool, the targets can be found - * in ./build/src/core/bpf/socket_bind/socket-bind.skel.h */ + * in ./build/src/core/bpf/socket-bind/socket-bind.skel.h */ extern DLSYM_PROTOTYPE(bpf_object__attach_skeleton); extern DLSYM_PROTOTYPE(bpf_object__destroy_skeleton); extern DLSYM_PROTOTYPE(bpf_object__detach_skeleton);