Skip to content

Commit

Permalink
packages: remove metal-k8s from settings
Browse files Browse the repository at this point in the history
Signed-off-by: Matthew Yeazel <[email protected]>
  • Loading branch information
yeazelm committed Nov 7, 2024
1 parent 80e49b8 commit 76ae7f5
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 44 deletions.
24 changes: 0 additions & 24 deletions packages/settings-defaults/settings-defaults.spec
Original file line number Diff line number Diff line change
Expand Up @@ -177,24 +177,6 @@ Conflicts: %{_cross_os}settings-defaults(any)
%description metal-dev
%{summary}.

%package metal-k8s-1.30
Summary: Settings defaults for the metal-k8s 1.27 through 1.30 variants
Requires: (%{shrink:
%{_cross_os}variant(metal-k8s-1.27) or
%{_cross_os}variant(metal-k8s-1.28) or
%{_cross_os}variant(metal-k8s-1.29) or
%{_cross_os}variant(metal-k8s-1.30)
%{nil}})
Provides: %{_cross_os}settings-defaults(any)
Provides: %{_cross_os}settings-defaults(metal-k8s-1.27)
Provides: %{_cross_os}settings-defaults(metal-k8s-1.28)
Provides: %{_cross_os}settings-defaults(metal-k8s-1.29)
Provides: %{_cross_os}settings-defaults(metal-k8s-1.30)
Conflicts: %{_cross_os}settings-defaults(any)

%description metal-k8s-1.30
%{summary}.

%package vmware-dev
Summary: Settings defaults for the vmware-dev variant
Requires: %{_cross_os}variant(vmware-dev)
Expand Down Expand Up @@ -246,7 +228,6 @@ for defaults in \
aws-k8s-1.31 \
aws-k8s-1.31-nvidia \
metal-dev \
metal-k8s-1.30 \
vmware-dev \
vmware-k8s-1.31 \
;
Expand Down Expand Up @@ -283,7 +264,6 @@ for defaults in \
aws-k8s-1.31 \
aws-k8s-1.31-nvidia \
metal-dev \
metal-k8s-1.30 \
vmware-dev \
vmware-k8s-1.31 \
;
Expand Down Expand Up @@ -356,10 +336,6 @@ done
%{_cross_defaultsdir}/metal-dev.toml
%{_cross_tmpfilesdir}/storewolf-defaults-metal-dev.conf

%files metal-k8s-1.30
%{_cross_defaultsdir}/metal-k8s-1.30.toml
%{_cross_tmpfilesdir}/storewolf-defaults-metal-k8s-1.30.conf

%files vmware-dev
%{_cross_defaultsdir}/vmware-dev.toml
%{_cross_tmpfilesdir}/storewolf-defaults-vmware-dev.conf
Expand Down
20 changes: 0 additions & 20 deletions packages/settings-plugins/settings-plugins.spec
Original file line number Diff line number Diff line change
Expand Up @@ -98,19 +98,6 @@ Conflicts: %{_cross_os}settings-plugin(any)
%description metal-dev
%{summary}.

%package metal-k8s
Summary: Settings plugin for the metal-k8s variants
Requires: %{_cross_os}variant-family(metal-k8s)
Provides: %{_cross_os}settings-plugin(any)
Provides: %{_cross_os}settings-plugin(metal-k8s-1.27)
Provides: %{_cross_os}settings-plugin(metal-k8s-1.28)
Provides: %{_cross_os}settings-plugin(metal-k8s-1.29)
Provides: %{_cross_os}settings-plugin(metal-k8s-1.30)
Conflicts: %{_cross_os}settings-plugin(any)

%description metal-k8s
%{summary}.

%package vmware-dev
Summary: Settings plugin for the vmware-dev variant
Requires: %{_cross_os}variant(vmware-dev)
Expand Down Expand Up @@ -147,7 +134,6 @@ Conflicts: %{_cross_os}settings-plugin(any)
-p settings-plugin-aws-k8s \
-p settings-plugin-aws-k8s-nvidia \
-p settings-plugin-metal-dev \
-p settings-plugin-metal-k8s \
-p settings-plugin-vmware-dev \
-p settings-plugin-vmware-k8s \
%{nil}
Expand All @@ -164,7 +150,6 @@ for plugin in \
aws-k8s-nvidia \
aws-k8s \
metal-dev \
metal-k8s \
vmware-dev \
vmware-k8s \
;
Expand Down Expand Up @@ -215,11 +200,6 @@ done
%{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf.d/metal-dev.conf
%{_cross_tmpfilesdir}/settings-plugin-metal-dev.conf

%files metal-k8s
%{_cross_pluginsdir}/metal-k8s/libsettings.so
%{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf.d/metal-k8s.conf
%{_cross_tmpfilesdir}/settings-plugin-metal-k8s.conf

%files vmware-dev
%{_cross_pluginsdir}/vmware-dev/libsettings.so
%{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf.d/vmware-dev.conf
Expand Down

0 comments on commit 76ae7f5

Please sign in to comment.