From 4a588de7284be66000c6514826d5dc6273a34998 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Tue, 21 Apr 2026 17:33:49 -0700 Subject: [PATCH] main/postmarketos-base-ui-gnome: add duranium-specific config The kernel cmdline option is to prevent gnome-initial-setup from launching, because it doesn't work properly and conflicts with our first boot setup. On phosh this is technically not necessary since g-i-s won't try to start there, but adding this to the base gnome UI pkg means I wouldn't have to add sep. subpackages to gnome and gnome-mobile UI pkgs. The duranium subpkg also pulls in a plugin for gnome-software so that g-s can provide a frontend for pulling duranium image updates via sysupdate. Signed-off-by: Clayton Craft Part-of: --- .../50-duranium.conf | 6 ++++++ main/postmarketos-base-ui-gnome/APKBUILD | 20 ++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 main/postmarketos-base-ui-gnome/50-duranium.conf diff --git a/main/postmarketos-base-ui-gnome/50-duranium.conf b/main/postmarketos-base-ui-gnome/50-duranium.conf new file mode 100644 index 000000000..a3e9c76ea --- /dev/null +++ b/main/postmarketos-base-ui-gnome/50-duranium.conf @@ -0,0 +1,6 @@ +# Needed to prevent GDM from running gnome initial setup. +# FIXME: This (g-i-s) conflicts with our first boot config, at some point we +# should make our thing not run in favor of using g-i-s on GNOME installs, +# but g-i-s wasn't super reliable and is apparently being replaced +# https://gitlab.gnome.org/Teams/STF/setup +gnome.initial-setup=0 diff --git a/main/postmarketos-base-ui-gnome/APKBUILD b/main/postmarketos-base-ui-gnome/APKBUILD index 1cf6eaa80..9370ed945 100644 --- a/main/postmarketos-base-ui-gnome/APKBUILD +++ b/main/postmarketos-base-ui-gnome/APKBUILD @@ -2,8 +2,8 @@ # Co-Maintainer: Achill Gilgenast maintainer="Newbyte " pkgname=postmarketos-base-ui-gnome -pkgver=10 -pkgrel=4 +pkgver=11 +pkgrel=0 pkgdesc="Meta package for shared configuration for GNOME-based UIs" url="https://postmarketos.org" arch="noarch" @@ -32,9 +32,13 @@ depends=" source=" 00_postmarketos-base-ui-gnome.gschema.override 10_postmarketos-green-accent.gschema.override + 50-duranium.conf " options="!check" -subpackages="$pkgname-openrc" +subpackages=" + $pkgname-duranium + $pkgname-openrc + " _pmb_recommends=" decibels @@ -89,7 +93,17 @@ openrc() { mkdir "$subpkgdir" } +duranium() { + pkgdesc="$pkgdesc (Duranium)" + install_if="$pkgname=$pkgver-r$pkgrel postmarketos-duranium" + depends="gnome-software-plugin-sysupdate" + + install -Dm644 "$srcdir"/50-duranium.conf \ + -t "$subpkgdir"/usr/lib/kernel-cmdline.d +} + sha512sums=" 39b5bb5e669756e2a308ab61b7901e76a9eff9e37c82d50bd9ff77800e72c19b580256f617a2ad0949c1746ab4e163e5ce009c134ab77f8a32f758b1b963862e 00_postmarketos-base-ui-gnome.gschema.override c255b0914043f09ef5cc56d50c26e9c8885af128abc3ed5494606bd304eefdeb761ed3bc2d5f86f7c3bfb16f7fc21ca1a6d954c8d21e73e7a5e7612a84a78b7c 10_postmarketos-green-accent.gschema.override +d48775a344d221309fc4f6ab96ec9cd5e871290f940deb967369b8c65dcef570cc44f7c4e7980153390f9da2518fdcc4c0e0687e9e32a984f712bdb62ab65e3d 50-duranium.conf "