From ce2dc2b2c38ef27718be335a73b872e0c2377c98 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman Date: Sat, 26 Oct 2024 01:39:39 -0500 Subject: [PATCH] Add preset --- .../91-ultramarine-surface-default.preset | 5 ++++ ultramarine/release/ultramarine-release.spec | 26 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 ultramarine/release/91-ultramarine-surface-default.preset diff --git a/ultramarine/release/91-ultramarine-surface-default.preset b/ultramarine/release/91-ultramarine-surface-default.preset new file mode 100644 index 0000000..5c835c9 --- /dev/null +++ b/ultramarine/release/91-ultramarine-surface-default.preset @@ -0,0 +1,5 @@ +# Enable Ultramarine Surface images specific services in this file + +# Enable Surface services +enable surface-dtx-daemon.service +enable surface-dtx-userd.service diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index 3349bc8..006a19a 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -28,6 +28,8 @@ %bcond_without atomic_gnome %bcond_without atomic_xfce %bcond_without chromebook +%bcond_without surface + %if %{with flagship} || %{with plasma} || %{with gnome} || %{with xfce} || %{with atomic_flagship} || %{with atomic_plasma} || %{with atomic_gnome} || %{with atomic_xfce} %global with_desktop 1 @@ -102,6 +104,8 @@ Source63: ultramarine-xfce-protected.conf Source64: 88-ultramarine-chromebook-default.preset +Source65: 91-ultramarine-surface-default.preset + BuildRequires: systemd-rpm-macros %description @@ -513,6 +517,16 @@ Summary: Common configuration package for chromebook variants Common configuration package for chromebook variants %endif +####### Surface ####### + +%if %{with surface} +%package surface +Summary: Common configuration package for surface variants + +%description surface +Common configuration package for surface variants +%endif + ####### Desktop ####### %if %{with desktop} @@ -849,6 +863,13 @@ install -Dm0644 %{SOURCE64} -t $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-pres %endif +%if %{with surface} + +# Install systemd presets for surface +install -Dm0644 %{SOURCE65} -t $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ + +%endif + %if %{with gnome} || %{with atomic_gnome} # Install systemd presets for gnome @@ -1018,6 +1039,11 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/ %{_prefix}/lib/systemd/system-preset/88-ultramarine-chromebook-default.preset %endif +%if %{with surface} +%files surface +%{_prefix}/lib/systemd/system-preset/91-ultramarine-surface-default.preset +%endif + %if %{with atomic_desktop} %files atomic-desktop %attr(0644,root,root) %{_prefix}/share/polkit-1/rules.d/org.projectatomic.rpmostree1.rules