Skip to content

Commit

Permalink
Merge pull request #4038 from bcressey/settings-plugins
Browse files Browse the repository at this point in the history
migrate to settings plugins and eliminate variant-based conditional compilation
  • Loading branch information
bcressey authored Jun 13, 2024
2 parents 1f7f2ce + 6f4ab02 commit a8658b9
Show file tree
Hide file tree
Showing 463 changed files with 2,098 additions and 2,079 deletions.
9 changes: 7 additions & 2 deletions packages/os/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ name = "os"
version = "0.1.0"
edition = "2021"
publish = false
build = "build.rs"
build = "../build.rs"

[package.metadata.build-package]
variant-sensitive = true
source-groups = [
"api",
"bottlerocket-release",
Expand Down Expand Up @@ -34,6 +33,12 @@ glibc = { path = "../glibc" }

# RPM Requires
[dependencies]
# FIXME: this dependency will be removed when this package moves out of tree.
settings-plugins = { path = "../settings-plugins" }

# FIXME: this dependency will also be removed
settings-defaults = { path = "../settings-defaults" }

# We depend on these packages at runtime, and are expected to be pulled in
# by way of the `release` package.
# `host-ctr` for host containers functionality
Expand Down
14 changes: 0 additions & 14 deletions packages/os/build.rs

This file was deleted.

5 changes: 5 additions & 0 deletions packages/os/os.spec
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ Source200: migration-tmpfiles.conf
Source201: host-containers-tmpfiles.conf
Source202: thar-be-updates-tmpfiles.conf
Source203: bootstrap-containers-tmpfiles.conf
Source204: storewolf-tmpfiles.conf

# 3xx sources: udev rules
Source300: ephemeral-storage.rules
Expand Down Expand Up @@ -107,6 +108,7 @@ Requires: (%{_cross_os}driverdog if %{_cross_os}variant-flavor(nvidia))

%package -n %{_cross_os}apiserver
Summary: Bottlerocket API server
Requires: %{_cross_os}settings-plugins
%description -n %{_cross_os}apiserver
%{summary}.

Expand Down Expand Up @@ -153,6 +155,7 @@ Requires: %{_cross_os}host-ctr

%package -n %{_cross_os}storewolf
Summary: Data store creator
Requires: %{_cross_os}settings-defaults
%description -n %{_cross_os}storewolf
%{summary}.

Expand Down Expand Up @@ -519,6 +522,7 @@ install -p -m 0644 %{S:200} %{buildroot}%{_cross_tmpfilesdir}/migration.conf
install -p -m 0644 %{S:201} %{buildroot}%{_cross_tmpfilesdir}/host-containers.conf
install -p -m 0644 %{S:202} %{buildroot}%{_cross_tmpfilesdir}/thar-be-updates.conf
install -p -m 0644 %{S:203} %{buildroot}%{_cross_tmpfilesdir}/bootstrap-containers.conf
install -p -m 0644 %{S:204} %{buildroot}%{_cross_tmpfilesdir}/storewolf.conf

install -d %{buildroot}%{_cross_udevrulesdir}
install -p -m 0644 %{S:300} %{buildroot}%{_cross_udevrulesdir}/80-ephemeral-storage.rules
Expand Down Expand Up @@ -582,6 +586,7 @@ install -p -m 0644 %{S:400} %{S:401} %{S:402} %{buildroot}%{_cross_licensedir}
%files -n %{_cross_os}storewolf
%{_cross_bindir}/storewolf
%{_cross_unitdir}/storewolf.service
%{_cross_tmpfilesdir}/storewolf.conf

%files -n %{_cross_os}migration
%{_cross_bindir}/migrator
Expand Down
1 change: 1 addition & 0 deletions packages/os/storewolf-tmpfiles.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d /etc/storewolf 0700 root root -
39 changes: 0 additions & 39 deletions packages/settings-aws/settings-aws.spec

This file was deleted.

21 changes: 0 additions & 21 deletions packages/settings-cloudformation/Cargo.toml

This file was deleted.

39 changes: 0 additions & 39 deletions packages/settings-cloudformation/settings-cloudformation.spec

This file was deleted.

21 changes: 0 additions & 21 deletions packages/settings-container-registry/Cargo.toml

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "settings-dns"
name = "settings-defaults"
version = "0.1.0"
edition = "2021"
publish = false
Expand All @@ -10,7 +10,7 @@ path = "../packages.rs"

[package.metadata.build-package]
source-groups = [
"settings-extensions/dns"
"settings-defaults"
]

# RPM BuildRequires
Expand Down
Loading

0 comments on commit a8658b9

Please sign in to comment.