From 842b5a46120c95a3b34f200384bbac49262ccf6a Mon Sep 17 00:00:00 2001 From: june-fish Date: Sun, 18 Aug 2024 14:59:16 -0500 Subject: [PATCH 1/5] add chromebook edition systemd presets --- .../88-ultramarine-chromebook-default.preset | 5 +++++ ultramarine/release/ultramarine-release.spec | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 ultramarine/release/88-ultramarine-chromebook-default.preset diff --git a/ultramarine/release/88-ultramarine-chromebook-default.preset b/ultramarine/release/88-ultramarine-chromebook-default.preset new file mode 100644 index 0000000..2468747 --- /dev/null +++ b/ultramarine/release/88-ultramarine-chromebook-default.preset @@ -0,0 +1,5 @@ +# Enable Ultramarine Chromebook Edition specific services in this file + +# Enable chromebook-specific keyboard mappings +enable cros-keyboard-map.service +enable keyd.service diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index dd0b3ba..556509c 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -101,6 +101,8 @@ Source61: ultramarine-gnome-protected.conf Source62: ultramarine-kde-protected.conf Source63: ultramarine-xfce-protected.conf +Source64: 88-ultramarine-chromebook-default.preset + BuildRequires: systemd-rpm-macros %description @@ -578,6 +580,16 @@ Provides the necessary files for a Ultramarine Atomic XFCE installation. #### Accessory packages ###################################################################### +####### Chromebook ####### + +%if %{with chromebook} +%package chromebook +Summary: Common configuration package for chromebook variants + +%description desktop +Common configuration package for chromebook variants +%endif + ####### Desktop ####### %if %{with desktop} @@ -928,6 +940,13 @@ install -Dm0644 %{SOURCE5} -t $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-prese %endif +%if %{with chromebook} + +# Install systemd presets for chromebook +install -Dm0644 %{SOURCE} -t $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ + +%endif + %if %{with gnome} || %{with atomic_gnome} # Install systemd presets for gnome From d3c0992e4f4f74a951bf581fab032a52a5b94e3d Mon Sep 17 00:00:00 2001 From: june <159748074+june-fish@users.noreply.github.com> Date: Sun, 18 Aug 2024 15:36:35 -0500 Subject: [PATCH 2/5] oops Co-authored-by: lea --- ultramarine/release/ultramarine-release.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index 556509c..9d5d492 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -586,7 +586,7 @@ Provides the necessary files for a Ultramarine Atomic XFCE installation. %package chromebook Summary: Common configuration package for chromebook variants -%description desktop +%description chromebook Common configuration package for chromebook variants %endif From 60629b981c8b2eb60f55b94451f8f0648d2d6435 Mon Sep 17 00:00:00 2001 From: june-fish Date: Sun, 18 Aug 2024 15:38:37 -0500 Subject: [PATCH 3/5] define chromebook --- ultramarine/release/ultramarine-release.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index 556509c..8c60ef9 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -29,6 +29,7 @@ %bcond_without atomic_kde %bcond_without atomic_gnome %bcond_without atomic_xfce +%bcond_without chromebook %if %{with flagship} || %{with pantheon} || %{with kde} || %{with gnome} || %{with xfce} || %{with atomic_flagship} || %{with atomic_pantheon} || %{with atomic_kde} || %{with atomic_gnome} || %{with atomic_xfce} %global with_desktop 1 From ed2653ab8993e9b79d40f5bae3c08977f514a91f Mon Sep 17 00:00:00 2001 From: june <159748074+june-fish@users.noreply.github.com> Date: Sun, 18 Aug 2024 15:42:37 -0500 Subject: [PATCH 4/5] oops i need coffeeeeeeeeee Co-authored-by: lea --- ultramarine/release/ultramarine-release.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index 20b39f1..959bd6c 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -944,7 +944,7 @@ install -Dm0644 %{SOURCE5} -t $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-prese %if %{with chromebook} # Install systemd presets for chromebook -install -Dm0644 %{SOURCE} -t $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ +install -Dm0644 %{SOURCE64} -t $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ %endif From 073b895e6592cbc037dc8fbeb7b55ae24d1a3c00 Mon Sep 17 00:00:00 2001 From: june-fish Date: Sun, 18 Aug 2024 15:47:51 -0500 Subject: [PATCH 5/5] add ultramarine chromebook preset to %files --- ultramarine/release/ultramarine-release.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index 959bd6c..e54c090 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -1127,6 +1127,11 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/ %{_prefix}/lib/systemd/system-preset/81-desktop.preset %endif +%if %{with chromebook} +%files chromebook +%{_prefix}/lib/systemd/system-preset/88-ultramarine-chromebook-default.preset +%endif + %if %{with atomic_desktop} %files atomic-desktop %attr(0644,root,root) %{_prefix}/share/polkit-1/rules.d/org.projectatomic.rpmostree1.rules