Skip to content

Commit 35ee3c9

Browse files
authored
fold some steps into openscap (#44505)
### What does this PR do? Folds away some discrete omnibus steps into openscap. This is mostly to reduce the number of nodes in the omnibus graph, but also to stop the needless extra downloads of the sources. Co-authored-by: tony.aiuto <tony.aiuto@datadoghq.com>
1 parent b472220 commit 35ee3c9

File tree

5 files changed

+15
-91
lines changed

5 files changed

+15
-91
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@
308308
/omnibus/config/patches/openscap/ @DataDog/agent-cspm
309309
/omnibus/config/software/datadog-agent-integrations-*.rb @DataDog/agent-integrations
310310
/omnibus/config/software/datadog-security-agent*.rb @DataDog/agent-security @DataDog/agent-build
311-
/omnibus/config/software/openscap.rb @DataDog/agent-cspm
311+
/omnibus/config/software/openscap.rb @DataDog/agent-build @DataDog/agent-cspm
312312
/omnibus/config/templates/init-scripts-agent/ @DataDog/agent-build @DataDog/fleet
313313
/omnibus/resources/*/msi/ @DataDog/windows-products
314314

omnibus/config/software/attr.rb

Lines changed: 0 additions & 36 deletions
This file was deleted.

omnibus/config/software/dbus.rb

Lines changed: 0 additions & 13 deletions
This file was deleted.

omnibus/config/software/openscap.rb

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@
2121
" #{install_dir}/embedded/lib/pkgconfig/libacl.pc" \
2222
" #{install_dir}/embedded/lib/libacl.so"
2323

24+
command_on_repo_root "bazelisk run -- @attr//:install --destdir='#{install_dir}'"
25+
command_on_repo_root "bazelisk run -- //bazel/rules:replace_prefix --prefix '#{install_dir}/embedded'" \
26+
" #{install_dir}/embedded/lib/pkgconfig/libattr.pc" \
27+
" #{install_dir}/embedded/lib/libattr.so"
28+
29+
command_on_repo_root "bazelisk run -- @dbus//:install --destdir='#{install_dir}/embedded'"
30+
command_on_repo_root "bazelisk run -- //bazel/rules:replace_prefix --prefix '#{install_dir}/embedded'" \
31+
" #{install_dir}/embedded/lib/pkgconfig/dbus-1.pc"
32+
2433
command_on_repo_root "bazelisk run -- @libselinux//:install --destdir='#{install_dir}/embedded'"
2534
command_on_repo_root "bazelisk run -- //bazel/rules:replace_prefix --prefix '#{install_dir}/embedded'" \
2635
" #{install_dir}/embedded/lib/pkgconfig/libselinux.pc" \
@@ -36,18 +45,20 @@
3645
"--prefix #{install_dir}/embedded " \
3746
"#{install_dir}/embedded/lib/pkgconfig/libpcre2*.pc " \
3847
"#{install_dir}/embedded/lib/libpcre2*.so"
48+
49+
command_on_repo_root "bazelisk run -- @util-linux//:blkid_install --destdir='#{install_dir}/embedded'"
50+
command_on_repo_root "bazelisk run -- //bazel/rules:replace_prefix --prefix '#{install_dir}/embedded'" \
51+
" #{install_dir}/embedded/lib/pkgconfig/blkid.pc" \
52+
" #{install_dir}/embedded/lib/libblkid.so"
3953
end
4054

41-
dependency 'attr'
4255
dependency 'bzip2'
4356
dependency 'curl'
44-
dependency 'dbus'
4557
dependency 'libgcrypt'
4658
dependency 'libxslt'
4759
dependency 'libyaml'
4860
dependency 'popt'
4961
dependency 'rpm'
50-
dependency 'util-linux'
5162
dependency 'xmlsec'
5263

5364
relative_path "openscap-#{version}"

omnibus/config/software/util-linux.rb

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)