From d6d2f07cc3fca661a39d5764afa17ba41be502c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Wed, 20 Nov 2024 09:59:26 +0100 Subject: [PATCH] drop unneeded check we only depend on system probe when it's enabled --- omnibus/config/software/system-probe.rb | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/omnibus/config/software/system-probe.rb b/omnibus/config/software/system-probe.rb index 5e84d0d662b09..8c889601879d8 100644 --- a/omnibus/config/software/system-probe.rb +++ b/omnibus/config/software/system-probe.rb @@ -5,8 +5,6 @@ name 'system-probe' -require './lib/project_helpers.rb' - source path: '..' relative_path 'src/github.com/DataDog/datadog-agent' @@ -23,19 +21,17 @@ mkdir "#{install_dir}/embedded/share/system-probe/ebpf/co-re/btf" mkdir "#{install_dir}/embedded/share/system-probe/java" - if sysprobe_enabled? - arch = `uname -m`.strip - if arch == "aarch64" - arch = "arm64" - end - copy "pkg/ebpf/bytecode/build/#{arch}/*.o", "#{install_dir}/embedded/share/system-probe/ebpf/" - delete "#{install_dir}/embedded/share/system-probe/ebpf/usm_events_test*.o" - copy "pkg/ebpf/bytecode/build/#{arch}/co-re/*.o", "#{install_dir}/embedded/share/system-probe/ebpf/co-re/" - copy "pkg/ebpf/bytecode/build/runtime/*.c", "#{install_dir}/embedded/share/system-probe/ebpf/runtime/" - copy "#{ENV['SYSTEM_PROBE_BIN']}/clang-bpf", "#{install_dir}/embedded/bin/clang-bpf" - copy "#{ENV['SYSTEM_PROBE_BIN']}/llc-bpf", "#{install_dir}/embedded/bin/llc-bpf" - copy "#{ENV['SYSTEM_PROBE_BIN']}/minimized-btfs.tar.xz", "#{install_dir}/embedded/share/system-probe/ebpf/co-re/btf/minimized-btfs.tar.xz" + arch = `uname -m`.strip + if arch == "aarch64" + arch = "arm64" end + copy "pkg/ebpf/bytecode/build/#{arch}/*.o", "#{install_dir}/embedded/share/system-probe/ebpf/" + delete "#{install_dir}/embedded/share/system-probe/ebpf/usm_events_test*.o" + copy "pkg/ebpf/bytecode/build/#{arch}/co-re/*.o", "#{install_dir}/embedded/share/system-probe/ebpf/co-re/" + copy "pkg/ebpf/bytecode/build/runtime/*.c", "#{install_dir}/embedded/share/system-probe/ebpf/runtime/" + copy "#{ENV['SYSTEM_PROBE_BIN']}/clang-bpf", "#{install_dir}/embedded/bin/clang-bpf" + copy "#{ENV['SYSTEM_PROBE_BIN']}/llc-bpf", "#{install_dir}/embedded/bin/llc-bpf" + copy "#{ENV['SYSTEM_PROBE_BIN']}/minimized-btfs.tar.xz", "#{install_dir}/embedded/share/system-probe/ebpf/co-re/btf/minimized-btfs.tar.xz" copy 'pkg/ebpf/c/COPYING', "#{install_dir}/embedded/share/system-probe/ebpf/" end