From 11804df8ad7f906eea5a24b90fd98578dd3d883d Mon Sep 17 00:00:00 2001 From: Owen Zimmerman Date: Sat, 18 Jan 2025 17:08:07 -0600 Subject: [PATCH 1/7] Move msm-cros-efs-loader from Terra, add epoch and change name --- ultramarine/msm-cros-efs-loader/anda.hcl | 5 ++ .../msm-cros-efs-loader.service | 11 +++++ .../msm-cros-efs-loader.spec | 48 +++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 ultramarine/msm-cros-efs-loader/anda.hcl create mode 100644 ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.service create mode 100644 ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.spec diff --git a/ultramarine/msm-cros-efs-loader/anda.hcl b/ultramarine/msm-cros-efs-loader/anda.hcl new file mode 100644 index 0000000..33c6c70 --- /dev/null +++ b/ultramarine/msm-cros-efs-loader/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "msm-cros-efs-loader.spec" + } +} diff --git a/ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.service b/ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.service new file mode 100644 index 0000000..d6582f8 --- /dev/null +++ b/ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.service @@ -0,0 +1,11 @@ +[Unit] +Description=EFS loader for Qualcomm-based Chrome OS devices + +[Service] +ExecStartPre=/usr/bin/msm-cros-efs-loader +ExecStart=/usr/bin/rmtfs -o /var/lib/rmtfs -r -s +Restart=always +RestartSec=1 + +[Install] +WantedBy=multi-user.target diff --git a/ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.spec b/ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.spec new file mode 100644 index 0000000..491860a --- /dev/null +++ b/ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.spec @@ -0,0 +1,48 @@ +Name: msm-cros-efs-loader +Version: 1.0.2 +Release: 2%?dist +Summary: EFS loader for Qualcomm-based Chrome OS devices +Epoch: 1 +License: GPL-3.0-or-later +URL: https://gitlab.postmarketos.org/postmarketOS/msm-cros-efs-loader +Source0: %{url}/-/archive/v%{version}/msm-cros-efs-loader-v%{version}.tar.gz +Source1: msm-cros-efs-loader.service +Requires: rmtfs crossystem +BuildArch: noarch +Packager: WeirdTreeThing +Conflicts: msm-cros-efs-loader +Provides: msm-cros-efs-loader + +%{?systemd_requires} +BuildRequires: systemd-rpm-macros + +%description +EFS loader for Qualcomm-based Chrome OS devices + +%prep +%autosetup -n msm-cros-efs-loader-v%{version} + +%install +install -Dm755 msm-cros-efs-loader.sh %{buildroot}/usr/bin/msm-cros-efs-loader +install -Dm644 %SOURCE1 %{buildroot}/%{_unitdir}/msm-cros-efs-loader.service + +# These systemd services should be included in the preset file for Ultramarine Linux sc7180 (ARM) Chromebook images +%post +%systemd_post msm-cros-efs-loader.service + +%preun +%systemd_preun msm-cros-efs-loader.service + +%postun +%systemd_postun_with_restart msm-cros-efs-loader.service + +%files +%_bindir/msm-cros-efs-loader +%{_unitdir}/msm-cros-efs-loader.service + +%changelog +* Sat 18 2025 Owen Zimmerman +- Move to umpkgs, change name back to original and add Epoch + +* Fri Oct 25 2024 WeirdTreeThing +- initial release From f9ecbc6713c0c8a2eac7fc05f5fbce10eccd84e5 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman Date: Sun, 19 Jan 2025 19:34:46 -0600 Subject: [PATCH 2/7] Update comps.xml for community wallpapers --- comps.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/comps.xml b/comps.xml index a298abe..0aab7ed 100644 --- a/comps.xml +++ b/comps.xml @@ -99,6 +99,7 @@ gs-plugin-ultramarine-pkgdb-collections xdg-user-dirs-gtk xdg-desktop-portal-gtk + ultramarine-backgrounds-community-gnome @@ -252,6 +253,7 @@ xdg-desktop-portal-gtk xdg-user-dirs-gtk seahorse + ultramarine-backgrounds-community-gnome @@ -307,6 +309,7 @@ krdp + ultramarine-backgrounds-community-kde @@ -399,6 +402,7 @@ xfce4-dict-plugin system-config-printer mugshot + ultramarine-backgrounds-community-gnome @@ -428,4 +432,4 @@ ultramarine-xfce-product - + \ No newline at end of file From 5635dbf6903c286399f0228c869f540ba48d8efa Mon Sep 17 00:00:00 2001 From: Owen Zimmerman Date: Sun, 19 Jan 2025 19:34:58 -0600 Subject: [PATCH 3/7] Add community wallpapers --- .../backgrounds/ultramarine-backgrounds.spec | 89 +++++++++++++++++-- 1 file changed, 81 insertions(+), 8 deletions(-) diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index 93404fd..f02ef1c 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -1,4 +1,4 @@ -%define ver 41.2 +%define ver 41.3 %undefine _disable_source_fetch Name: ultramarine-backgrounds @@ -62,10 +62,29 @@ Conflicts: desktop-backgrounds-compat %description compat The desktop-backgrounds-compat package contains compatibility symlinks for other desktop environments. +%package community +Summary: Other submissions from the Ultramarine Wallpaper contest + +%description community +Other submissions from the Ultramarine Wallpaper contest + +%package community-kde +Summary: community wallpapers for KDE +Requires: ultramarine-backgrounds-community + +%description community-kde +community wallpapers for KDE + +%package community-gnome +Summary: community wallpapers for gnome +Requires: ultramarine-backgrounds-community + +%description community-gnome +community wallpapers for gnome + %prep %autosetup -n backgrounds-%{ver} - %install rm -rf $RPM_BUILD_ROOT %make_install @@ -83,7 +102,6 @@ kde_link() { ln -rsf "%{buildroot}%{_datadir}/backgrounds/ultramarine-linux/$file" "%{buildroot}%{_datadir}/wallpapers/$wallname/contents/screenshot.png" } - kde_link 38/tortuga-dark.png "Tortuga Dark" kde_link 38/tortuga-light.png "Tortuga Light" @@ -105,6 +123,23 @@ kde_link 41/viewport-fake-dark.png "Viewports Fake Dark" kde_link 41/paradise-light.png "Paradise Light" kde_link 41/paradise-dark.png "Paradise Dark" +kde_link 41-community-extras/Eternal-Ultramarine-Dark.png "Eternal Ultramarine Dark" +kde_link 41-community-extras/Eternal-Ultramarine-Light.png "Eternal Ultramarine Light" + +kde_link 41-community-extras/Lazuli-Dark.png "Lazuli Dark" +kde_link 41-community-extras/Lazuli-Light.png "Lazuli Light" + +kde_link 41-community-extras/Lumos-Dawn.png "Lumos Dawn" + +kde_link 41-community-extras/Really-Long-Name.png "Really Long Name" + +kde_link 41-community-extras/Wavelength.png "Wavelength" + +kde_link 41-community-extras/wavelet-dark.png "Wavelet Dark" +kde_link 41-community-extras/wavelet-light.png "Wavelet Light" + +kde_link 41-community-extras/Waves-clean.png "Waves Clean" + kde_link preview/blueprint.png "Ultramarine Preview" kde_link ultramarine/ultramarine-dark.png "Ultramarine Dark" @@ -118,7 +153,6 @@ compat_link() { ln -rsf "%{buildroot}%{_datadir}/backgrounds/ultramarine-linux/$file" "%{buildroot}%{_datadir}/backgrounds/$dest" } - DEFAULT_WALL="41/viewports-light.png" DEFAULT_DARK_WALL="41/viewports-dark.png" DEFAULT_XML="41/viewports.xml" @@ -131,7 +165,6 @@ picture-uri='file://%{_datadir}/backgrounds/default.png' picture-uri-dark='file:///%{_datadir}/backgrounds/default-dark.png' EOF - compat_link $DEFAULT_WALL default.png compat_link $DEFAULT_DARK_WALL default-dark.png compat_link $DEFAULT_XML default.xml @@ -152,7 +185,14 @@ compat_link $DEFAULT_DARK_WALL images/default-dark-16_10.png %license COPYING %files common -%{_datadir}/backgrounds/ultramarine-linux/ +%{_datadir}/backgrounds/ultramarine-linux/38/ +%{_datadir}/backgrounds/ultramarine-linux/39/ +%{_datadir}/backgrounds/ultramarine-linux/40/ +%{_datadir}/backgrounds/ultramarine-linux/41/ +%{_datadir}/backgrounds/ultramarine-linux/41~beta/ +%{_datadir}/backgrounds/ultramarine-linux/extras/ +%{_datadir}/backgrounds/ultramarine-linux/preview/ +%{_datadir}/backgrounds/ultramarine-linux/ultramarine/ %{_datadir}/glib-2.0/schemas/30_default_backgrounds.gschema.override /usr/share/wallpapers/Ultramarine*/metadata.desktop @@ -161,7 +201,23 @@ compat_link $DEFAULT_DARK_WALL images/default-dark-16_10.png %{_datadir}/gnome-background-properties/ultramarine.xml %files kde -%{_datadir}/wallpapers/* +"%{_datadir}/wallpapers/Tortuga Dark" +"%{_datadir}/wallpapers/Tortuga Light" +"%{_datadir}/wallpapers/Forresty Skies Dark" +"%{_datadir}/wallpapers/Forresty Skies Light" +"%{_datadir}/wallpapers/Lost Dark" +"%{_datadir}/wallpapers/Lost Light" +"%{_datadir}/wallpapers/Umbrella Dark" +"%{_datadir}/wallpapers/Umbrella Light" +"%{_datadir}/wallpapers/Ultramarine 41 Beta" +"%{_datadir}/wallpapers/Viewports Light" +"%{_datadir}/wallpapers/Viewports Dark" +"%{_datadir}/wallpapers/Viewports Fake Dark" +"%{_datadir}/wallpapers/Paradise Light" +"%{_datadir}/wallpapers/Paradise Dark" +"%{_datadir}/wallpapers/Ultramarine Preview" +"%{_datadir}/wallpapers/Ultramarine Dark" +"%{_datadir}/wallpapers/Ultramarine Light" %files compat %dir %{_datadir}/backgrounds/images/ @@ -170,6 +226,23 @@ compat_link $DEFAULT_DARK_WALL images/default-dark-16_10.png %{_datadir}/backgrounds/default-dark.png %{_datadir}/backgrounds/default.xml +%files community +%{_datadir}/backgrounds/ultramarine-linux/41-community-extras/ + +%files community-gnome +%{_datadir}/gnome-background-properties/41-community-extras.xml + +%files community-kde +"%{_datadir}/wallpapers/Eternal Ultramarine Dark" +"%{_datadir}/wallpapers/Eternal Ultramarine Light" +"%{_datadir}/wallpapers/Lazuli Dark" +"%{_datadir}/wallpapers/Lazuli Light" +"%{_datadir}/wallpapers/Lumos Dawn" +"%{_datadir}/wallpapers/Really Long Name" +"%{_datadir}/wallpapers/Wavelength" +"%{_datadir}/wallpapers/Wavelet Dark" +"%{_datadir}/wallpapers/Wavelet Light" +"%{_datadir}/wallpapers/Waves Clean" %changelog -%autochangelog -p -l 5 -s -c -o $PWD/ultramarine-backgrounds.spec +%autochangelog -p -l 5 -s -c -o $PWD/ultramarine-backgrounds.spec \ No newline at end of file From d9777777a69df9eb0c357a07d3c9dca78b58a562 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman Date: Sun, 19 Jan 2025 19:38:24 -0600 Subject: [PATCH 4/7] Remove old files --- ultramarine/msm-cros-efs-loader/anda.hcl | 5 -- .../msm-cros-efs-loader.service | 11 ----- .../msm-cros-efs-loader.spec | 48 ------------------- 3 files changed, 64 deletions(-) delete mode 100644 ultramarine/msm-cros-efs-loader/anda.hcl delete mode 100644 ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.service delete mode 100644 ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.spec diff --git a/ultramarine/msm-cros-efs-loader/anda.hcl b/ultramarine/msm-cros-efs-loader/anda.hcl deleted file mode 100644 index 33c6c70..0000000 --- a/ultramarine/msm-cros-efs-loader/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "msm-cros-efs-loader.spec" - } -} diff --git a/ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.service b/ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.service deleted file mode 100644 index d6582f8..0000000 --- a/ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=EFS loader for Qualcomm-based Chrome OS devices - -[Service] -ExecStartPre=/usr/bin/msm-cros-efs-loader -ExecStart=/usr/bin/rmtfs -o /var/lib/rmtfs -r -s -Restart=always -RestartSec=1 - -[Install] -WantedBy=multi-user.target diff --git a/ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.spec b/ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.spec deleted file mode 100644 index 491860a..0000000 --- a/ultramarine/msm-cros-efs-loader/msm-cros-efs-loader.spec +++ /dev/null @@ -1,48 +0,0 @@ -Name: msm-cros-efs-loader -Version: 1.0.2 -Release: 2%?dist -Summary: EFS loader for Qualcomm-based Chrome OS devices -Epoch: 1 -License: GPL-3.0-or-later -URL: https://gitlab.postmarketos.org/postmarketOS/msm-cros-efs-loader -Source0: %{url}/-/archive/v%{version}/msm-cros-efs-loader-v%{version}.tar.gz -Source1: msm-cros-efs-loader.service -Requires: rmtfs crossystem -BuildArch: noarch -Packager: WeirdTreeThing -Conflicts: msm-cros-efs-loader -Provides: msm-cros-efs-loader - -%{?systemd_requires} -BuildRequires: systemd-rpm-macros - -%description -EFS loader for Qualcomm-based Chrome OS devices - -%prep -%autosetup -n msm-cros-efs-loader-v%{version} - -%install -install -Dm755 msm-cros-efs-loader.sh %{buildroot}/usr/bin/msm-cros-efs-loader -install -Dm644 %SOURCE1 %{buildroot}/%{_unitdir}/msm-cros-efs-loader.service - -# These systemd services should be included in the preset file for Ultramarine Linux sc7180 (ARM) Chromebook images -%post -%systemd_post msm-cros-efs-loader.service - -%preun -%systemd_preun msm-cros-efs-loader.service - -%postun -%systemd_postun_with_restart msm-cros-efs-loader.service - -%files -%_bindir/msm-cros-efs-loader -%{_unitdir}/msm-cros-efs-loader.service - -%changelog -* Sat 18 2025 Owen Zimmerman -- Move to umpkgs, change name back to original and add Epoch - -* Fri Oct 25 2024 WeirdTreeThing -- initial release From e4b0aa4e52578b479c63576c669d8ce849e173d6 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 26 Jan 2025 20:05:34 -0600 Subject: [PATCH 5/7] Bump release --- ultramarine/backgrounds/ultramarine-backgrounds.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index f02ef1c..8061d7f 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -1,4 +1,4 @@ -%define ver 41.3 +%define ver 41.4 %undefine _disable_source_fetch Name: ultramarine-backgrounds @@ -245,4 +245,4 @@ compat_link $DEFAULT_DARK_WALL images/default-dark-16_10.png "%{_datadir}/wallpapers/Waves Clean" %changelog -%autochangelog -p -l 5 -s -c -o $PWD/ultramarine-backgrounds.spec \ No newline at end of file +%autochangelog -p -l 5 -s -c -o $PWD/ultramarine-backgrounds.spec From 63ab7eaf5803430cf830cc45476c5da722eedea3 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 28 Jan 2025 21:36:40 -0600 Subject: [PATCH 6/7] waves-clean is lowercase --- ultramarine/backgrounds/ultramarine-backgrounds.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index 8061d7f..50656fd 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -138,7 +138,7 @@ kde_link 41-community-extras/Wavelength.png "Wavelength" kde_link 41-community-extras/wavelet-dark.png "Wavelet Dark" kde_link 41-community-extras/wavelet-light.png "Wavelet Light" -kde_link 41-community-extras/Waves-clean.png "Waves Clean" +kde_link 41-community-extras/waves-clean.png "Waves Clean" kde_link preview/blueprint.png "Ultramarine Preview" From 5805444516c58dea01b88cba292fccf9b1bf5e8d Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Thu, 30 Jan 2025 05:31:34 +0000 Subject: [PATCH 7/7] Bump: ultramarine-backgrounds --- ultramarine/backgrounds/ultramarine-backgrounds.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index 50656fd..1e5dc43 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -1,4 +1,4 @@ -%define ver 41.4 +%define ver 41.5 %undefine _disable_source_fetch Name: ultramarine-backgrounds