fix: re-add calamares to CI, fix empty local repo db, wire in CMAKE_DISTRIBUTION_NAME='Antergos NeXT', enable services-openrc module

build-packages.py

@@ -12,12 +12,23 @@ def repo_init():
     conf_path = "/etc/pacman.conf"
     with open(conf_path) as f:
         conf = f.read()
+    # Insert before first active repo ([system] for Artix, [core] for Arch)
+    for tag in ("[system]", "[core]"):
+        if tag in conf:
+            sep = tag
+            break
+    else:
+        sep = "[options]"
     if "[antergos-local]" not in conf:
         with open(conf_path, "w") as f:
             f.write(conf.replace(
-                "[core]",
-                "[antergos-local]\nSigLevel = Never\nServer = file:///tmp/pkgout\n\n[core]"
+                sep,
+                "[antergos-local]\nSigLevel = Never\nServer = file:///tmp/pkgout\n\n" + sep
             ))
+    # Create empty repo db so pacman doesn't choke
+    db = f"{LOCAL_REPO}/antergos-local.db.tar.gz"
+    if not os.path.exists(db):
+        subprocess.run(["bsdtar", "-czf", db, "-T", "/dev/null"])
 
 def repo_add(pkg_path):
     db = f"{LOCAL_REPO}/antergos-local.db.tar.gz"

packages.yaml

@@ -10,4 +10,5 @@ packages:
   - antergos-live
   - antergos-next-memes
   - antergos-welcome
-  - hal
+  - hal
+  - calamares

packages/antergos-live/PKGBUILD

@@ -7,7 +7,7 @@ pkgname=('antergos-live-base'
         'antergos-live-openrc'
         'antergos-grub-live')
 pkgver=2026.06
-pkgrel=1
+pkgrel=2
 pkgdesc='Antergos live session'
 arch=('any')
 url="https://github.com/Antergos-NeXT/antergos-live"
@@ -36,6 +36,10 @@ package_antergos-live-base() {
     depends=('artools-base' 'bash')
 
     make -C artix-live DESTDIR=${pkgdir} install_base install_xdg
+
+    # Rename binary and fix internal references
+    sed -i 's/LIVEUSER=${LIVEUSER:-artix}/LIVEUSER=${LIVEUSER:-liveuser}/g; s|LOGFILE='\''/var/log/artix-live.log'\''|LOGFILE='\''/var/log/antergos-live.log'\''|g' "${pkgdir}/usr/bin/artix-live" 2>/dev/null || true
+    mv "${pkgdir}/usr/bin/artix-live" "${pkgdir}/usr/bin/antergos-live" 2>/dev/null || true
 }
 
 package_antergos-live-openrc() {
@@ -46,8 +50,12 @@ package_antergos-live-openrc() {
 
     make -C artix-live DESTDIR=${pkgdir} install_rc
 
+    # Rename init script and fix internal references
+    sed -i 's/artix live script/antergos live script/g; s|/usr/bin/artix-live|/usr/bin/antergos-live|g' "${pkgdir}/etc/init.d/artix-live" 2>/dev/null || true
+    mv "${pkgdir}/etc/init.d/artix-live" "${pkgdir}/etc/init.d/antergos-live" 2>/dev/null || true
+
     install -d "${pkgdir}"/etc/runlevels/default
-    ln -sf /etc/init.d/artix-live "${pkgdir}"/etc/runlevels/default/antergos-live
+    ln -sf /etc/init.d/antergos-live "${pkgdir}"/etc/runlevels/default/antergos-live
     ln -sf /etc/init.d/pacman-init "${pkgdir}"/etc/runlevels/default/pacman-init
 }
 

packages/calamares-branding-antergos-next/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=calamares-branding-antergos-next
 pkgver=1.0
-pkgrel=13
+pkgrel=14
 pkgdesc="Calamares branding for Antergos NeXT with offline/online installer support"
 arch=('any')
 url="https://github.com/Antergos-NeXT"

packages/calamares-branding-antergos-next/calamares-next.sh

@@ -96,7 +96,7 @@ AskMode() {
             --field=" ":LBL "" \
             --field="<b>Offline Install</b>":LBL "" \
             --field="Quick install from the live ISO.":LBL "" \
-            --field="Install GNOME desktop directly from the ISO.":LBL "" \
+            --field="Install KDE Plasma desktop directly from the ISO.":LBL "" \
             --field="No internet required.":LBL "" \
             --field=" ":LBL "" \
             --button="Offline":13 \
@@ -111,7 +111,7 @@ AskMode() {
             --field=" ":LBL "" \
             --field="<b>Offline Install</b>":LBL "" \
             --field="Quick install from the live ISO.":LBL "" \
-            --field="Install GNOME desktop directly from the ISO.":LBL "" \
+            --field="Install KDE Plasma desktop directly from the ISO.":LBL "" \
             --field=" ":LBL "" \
             --button="Offline":13
     fi

packages/calamares-branding-antergos-next/netinstall.yaml

@@ -1,6 +1,6 @@
 - name: "KDE Plasma"
   description: "Full-featured, modern desktop with KDE Plasma and applications"
-  selected: false
+  selected: true
   critical: false
   packages:
     - ark
@@ -41,38 +41,6 @@
     - spectacle
     - xdg-desktop-portal-kde
     - xsettingsd
-- name: "GNOME"
-  description: "Modern and streamlined desktop environment"
-  selected: true
-  critical: false
-  packages:
-    - adwaita-icon-theme
-    - evince
-    - file-roller
-    - gdm
-    - gnome-calculator
-    - gnome-clocks
-    - gnome-console
-    - gnome-control-center
-    - gnome-disk-utility
-    - gnome-keyring
-    - gnome-shell
-    - gnome-system-monitor
-    - gnome-terminal
-    - gnome-text-editor
-    - gnome-themes-extra
-    - gnome-tweaks
-    - gvfs
-    - gvfs-afc
-    - gvfs-gphoto2
-    - gvfs-mtp
-    - gvfs-nfs
-    - gvfs-smb
-    - loupe
-    - nautilus
-    - sushi
-    - xdg-desktop-portal-gnome
-    - xdg-user-dirs-gtk
 - name: "Xfce"
   description: "Fast and lightweight classic desktop"
   selected: false

packages/calamares/PKGBUILD

@@ -5,7 +5,7 @@
 _pkgname="calamares"
 pkgname="$_pkgname"
 pkgver=3.4.2
-pkgrel=3
+pkgrel=5
 pkgdesc="Distribution-independent installer framework"
 url="https://codeberg.org/Calamares/calamares"
 license=("GPL-3.0-or-later")
@@ -41,7 +41,6 @@ build() {
     initramfscfg
     interactiveterminal
     packagechooser
-    services-openrc
   )
 
   local _pkgsrc_dir="$srcdir/$_pkgname-$pkgver"
@@ -70,6 +69,7 @@ build() {
     -DKDE_INSTALL_MANDIR=/usr/share/man
     -DKDE_INSTALL_INFODIR=/usr/share/info
     -DKDE_INSTALL_SYSCONFDIR=/etc
+    -DCMAKE_DISTRIBUTION_NAME="Antergos NeXT"
     -Wno-dev
   )