fix: multiple packagechooser netinstall-add + ntp-dinit (KDE install, clock)

Relates to Antergos-NeXT/antergos-iso#14 (online install had no KDE
session; SDDM showed nothing).

Root cause: we run TWO packagechooser instances (DE chooser + DM chooser),
both with method: netinstall-add. Upstream Calamares tags all netinstall
data with the same hardcoded "packageChooser" source string, so when the
second instance (packagechooser@dm) wrote its groups it pruned EVERYTHING
tagged packageChooser from global storage - including the DE's groups.
KDE never reached packageOperations, so Plasma was never installed.

Fix: tag each instance's netinstall data with its own instance id
(packagechooser@de / packagechooser@dm, via m_defaultId) and prune using
that same id. Each chooser now only removes its own stale data and the
other instance's groups survive the merge.

Version: CALAMARES_VERSION 3.4.2 -> 3.4.2-w0k3 (BREATHTAKING).
Shows in About dialog, --version and libcalamares. pkgrel 8 -> 9,
local makepkg build of 3.4.2-9 verified clean.

Also add ntp-dinit to Init Services group in netinstall.yaml, so the
service exists on the installed system (relates to Antergos-NeXT/antergos-iso#13).
This commit is contained in:
2026-08-09 21:17:25 +02:00
parent 69ecc0a46b
commit 8ed1a6e5ad
3 changed files with 87 additions and 3 deletions
+10 -3
View File
@@ -5,7 +5,7 @@
_pkgname="calamares"
pkgname="$_pkgname"
pkgver=3.4.2
pkgrel=8
pkgrel=9
pkgdesc="Distribution-independent installer framework"
url="https://codeberg.org/Calamares/calamares"
license=("GPL-3.0-or-later")
@@ -29,8 +29,15 @@ makedepends=(
_pkgext="tar.gz"
DLAGENTS=('https::/usr/bin/curl -gqb "" -fLC - --http1.1 --retry 5 --retry-delay 5 -o %o %u')
source=("$_pkgname-$pkgver.$_pkgext"::"$url/releases/download/v$pkgver/$_pkgname-$pkgver.$_pkgext")
sha256sums=('733bbbb00dc9f84874bd5c22960952f317ea2537565431179fa2152b2fbfdccc')
source=("$_pkgname-$pkgver.$_pkgext"::"$url/releases/download/v$pkgver/$_pkgname-$pkgver.$_pkgext"
'multi-netinstall-add.patch')
sha256sums=('733bbbb00dc9f84874bd5c22960952f317ea2537565431179fa2152b2fbfdccc'
'18a0e1592b0f893256996f6071d539cbd692b920b4d3788e043442f3e707d795')
prepare() {
cd "$srcdir/$_pkgname-$pkgver"
patch -Np1 -i "$srcdir/multi-netinstall-add.patch"
}
build() {
local _skip_modules=(