Skip to content

[um42] feat(ultramarine-release): Add container variant (#295) #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GildedRoach merged 1 commit into from
Apr 13, 2026
Merged

[um42] feat(ultramarine-release): Add container variant (#295) #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ultramarine/release/CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
* Mon March 2 2026 Gilver E. <roachy@fyralabs.com>
- Add container variant
* Wed May 18 2022 Cappy Ishihara <cappy@cappuchino.xyz>
- Updated READMEs and alot of documentation things
53 changes: 52 additions & 1 deletion ultramarine/release/ultramarine-release.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
%bcond_without chromebook
%bcond_without raspberry_pi
%bcond_without wsl
%bcond_without container
%ifarch x86_64
%bcond_without surface
%else
Expand All @@ -52,7 +53,7 @@
Summary: Ultramarine Linux release files
Name: ultramarine-release
Version: %{dist_version}
Release: 21%{?dist}
Release: 22%{?dist}
License: MIT
Source0: LICENSE
URL: https://ultramarine-linux.org
Expand Down Expand Up @@ -570,6 +571,39 @@ Provides the necessary files for a Ultramarine WSL installation.

%endif

%if %{with container}
%package container
Summary: Base package for Ultramarine container specific default configurations

RemovePathPostfixes: .container
Provides: ultramarine-release = %{version}-%{release}
Provides: ultramarine-release-variant = %{version}-%{release}
Provides: system-release
Provides: system-release(%{version})
Requires: ultramarine-release-common = %{version}-%{release}

Recommends: ultramarine-release-identity-container


%description container
Provides a base package for Ultramarine container specific configuration files to
depend on as well as container system defaults.


%package identity-container
Summary: Package providing the identity for Ultramarine Container Base Image

RemovePathPostfixes: .container
Provides: ultramarine-release-identity = %{version}-%{release}
Conflicts: ultramarine-release-identity
Requires(meta): ultramarine-release-container = %{version}-%{release}


%description identity-container
Provides the necessary files for an Ultramarine installation that is identifying
itself as the Ultramarine Container Base Image.
%endif

######################################################################
#### Accessory packages
######################################################################
Expand Down Expand Up @@ -843,6 +877,16 @@ sed -i -e "s|(%{release_name}%{?prerelease})|(WSL Edition%{?prerelease})|g" %{bu
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/WSL/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.wsl
%endif

%if %{with container}
# Container
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.container
echo "VARIANT=\"Container Image\"" >> %{buildroot}%{_prefix}/lib/os-release.container
echo "VARIANT_ID=container" >> %{buildroot}%{_prefix}/lib/os-release.container
sed -i -e "s|(%{release_name}%{?prerelease})|(Container Image%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.container
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Container/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.container
%endif

# Create copr config file so COPR doesnt flip out and assume EPEL
# I created a PR to support this months ago, but completely forgot about it
# to the point that risiOS managed to beat us to it - Cappy
Expand Down Expand Up @@ -1152,6 +1196,13 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.wsl
%endif

%if %{with container}
%files container
%files identity-container
%{_prefix}/lib/os-release.container
%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.container
%endif

%if %{with desktop}
%files desktop
%{_prefix}/lib/systemd/system-preset/81-desktop.preset
Expand Down