Skip to content

Commit

Permalink
packages: remove ca-certificates
Browse files Browse the repository at this point in the history
Instead of being built as a package, the CA certificate bundle will be
installed via the Bottlerocket SDK or with a local bundle by passing
BUILDSYS_CACERTS_BUNDLE_OVERRIDE.
  • Loading branch information
jpculp authored and sumukhballal committed May 31, 2024
1 parent 3d4dd9e commit c86ccb8
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 58 deletions.
1 change: 0 additions & 1 deletion packages/ca-certificates/.gitignore

This file was deleted.

16 changes: 0 additions & 16 deletions packages/ca-certificates/Cargo.toml

This file was deleted.

34 changes: 0 additions & 34 deletions packages/ca-certificates/ca-certificates.spec

This file was deleted.

1 change: 0 additions & 1 deletion packages/release/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ path = "../packages.rs"
[dependencies]
acpid = { path = "../acpid" }
binutils = { path = "../binutils" }
ca-certificates = { path = "../ca-certificates" }
chrony = { path = "../chrony" }
conntrack-tools = { path = "../conntrack-tools" }
containerd = { path = "../containerd" }
Expand Down
4 changes: 3 additions & 1 deletion packages/release/release.spec
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Source95: release-systemd-networkd.conf
Source96: release-repart-local.conf
Source97: release-sysctl.conf
Source98: release-systemd-system.conf
Source99: release-ca-certificates-tmpfiles.conf

Source200: motd.template
Source201: proxy-env
Expand Down Expand Up @@ -99,7 +100,6 @@ Source1500: bootconfig-fips.conf

Requires: %{_cross_os}acpid
Requires: %{_cross_os}audit
Requires: %{_cross_os}ca-certificates
Requires: %{_cross_os}chrony
Requires: %{_cross_os}conntrack-tools
Requires: %{_cross_os}containerd
Expand Down Expand Up @@ -154,6 +154,7 @@ install -p -m 0644 %{S:11} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}

install -d %{buildroot}%{_cross_tmpfilesdir}
install -p -m 0644 %{S:93} %{buildroot}%{_cross_tmpfilesdir}/release.conf
install -p -m 0644 %{S:99} %{buildroot}%{_cross_tmpfilesdir}/release-ca-certificates.conf
install -p -m 0644 %{S:94} %{buildroot}%{_cross_tmpfilesdir}/release-fips.conf

install -d %{buildroot}%{_cross_libdir}/systemd/networkd.conf.d
Expand Down Expand Up @@ -260,6 +261,7 @@ ln -s preconfigured.target %{buildroot}%{_cross_unitdir}/default.target
%{_cross_factorydir}%{_cross_sysconfdir}/nsswitch.conf
%{_cross_sysctldir}/80-release.conf
%{_cross_tmpfilesdir}/release.conf
%{_cross_tmpfilesdir}/release-ca-certificates.conf
%{_cross_libdir}/os-release
%dir %{_cross_libdir}/repart.d
%{_cross_libdir}/repart.d/80-local.conf
Expand Down
5 changes: 0 additions & 5 deletions variants/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c86ccb8

Please sign in to comment.