Skip to content

Commit

Permalink
Merge pull request #51 from Ultramarine-Linux/june/um41/add-chromeboo…
Browse files Browse the repository at this point in the history
…k-edition-release

add: chromebook edition systemd presets
  • Loading branch information
lleyton authored Aug 18, 2024
2 parents 9b31f4e + 073b895 commit 961564a
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
5 changes: 5 additions & 0 deletions ultramarine/release/88-ultramarine-chromebook-default.preset
Original file line number Diff line number Diff line change
@@ -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
25 changes: 25 additions & 0 deletions ultramarine/release/ultramarine-release.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -101,6 +102,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
Expand Down Expand Up @@ -578,6 +581,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 chromebook
Common configuration package for chromebook variants
%endif

####### Desktop #######

%if %{with desktop}
Expand Down Expand Up @@ -928,6 +941,13 @@ install -Dm0644 %{SOURCE5} -t $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-prese

%endif

%if %{with chromebook}

# Install systemd presets for chromebook
install -Dm0644 %{SOURCE64} -t $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/

%endif

%if %{with gnome} || %{with atomic_gnome}

# Install systemd presets for gnome
Expand Down Expand Up @@ -1107,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
Expand Down

0 comments on commit 961564a

Please sign in to comment.