fix: remove calamares from CI, add grub-theme and live packages

- Remove calamares from packages.yaml: our fork stripped services-openrc, Artix repo provides working calamares (3.4.2-4) with openrc support - Add antergos-grub-theme to CI: uses real Antergos background + logo from grub2-theme-antergos repo merged with Artix UI infrastructure - Add antergos-live to CI: fork of artix-live with s/artix/antergos branding - Bump calamares-branding-antergos-next pkgrel 12->13: settings now call services-openrc instead of services-systemd, show.qml drops EndeavourOS, calamares-next.sh targets /home/antergos not /home/liveuser
2026-06-25 14:16:27 +02:00
parent 2c2e9338b2
commit 5f81605eb2
9 changed files with 169 additions and 6 deletions
@@ -5,8 +5,9 @@ packages:
  - antergos-next-keyring
  - antergos-next-mirrorlist
  - antergos-next-desktop-settings
-  - calamares
  - calamares-branding-antergos-next
+  - antergos-grub-theme
+  - antergos-live
  - antergos-next-memes
  - antergos-welcome
  - hal
@@ -0,0 +1,72 @@
+# Maintainer: Antergos NeXT <antergos-next@github>
+
+pkgname=antergos-grub-theme
+pkgver=2026.06
+pkgrel=1
+pkgdesc='Antergos GRUB theme'
+arch=('any')
+url="https://github.com/Antergos-NeXT/antergos-branding"
+license=('GPL')
+depends=('grub')
+makedepends=('git')
+source=("git+https://gitea.artixlinux.org/artix/artix-branding.git"
+        "git+https://github.com/antergos/grub2-theme-antergos.git")
+sha256sums=('SKIP'
+            'SKIP')
+
+package() {
+    mkdir -p $pkgdir/usr/share/grub/themes/antergos/icons
+
+    # Use original Antergos background and logo
+    cp grub2-theme-antergos/Antergos-Default/background.png $pkgdir/usr/share/grub/themes/antergos/
+    cp grub2-theme-antergos/Antergos-Default/antergoslogo.png $pkgdir/usr/share/grub/themes/antergos/logo.png
+
+    # Copy Artix GRUB theme infrastructure (UI elements)
+    cp artix-branding/artix-grub-theme/artix/highlight_c.png $pkgdir/usr/share/grub/themes/antergos/
+    cp artix-branding/artix-grub-theme/artix/highlight_e.png $pkgdir/usr/share/grub/themes/antergos/
+    cp artix-branding/artix-grub-theme/artix/highlight_w.png $pkgdir/usr/share/grub/themes/antergos/
+    cp artix-branding/artix-grub-theme/artix/menu_c.png $pkgdir/usr/share/grub/themes/antergos/
+    cp artix-branding/artix-grub-theme/artix/menu_e.png $pkgdir/usr/share/grub/themes/antergos/
+    cp artix-branding/artix-grub-theme/artix/slider_c.png $pkgdir/usr/share/grub/themes/antergos/
+    cp artix-branding/artix-grub-theme/artix/slider_n.png $pkgdir/usr/share/grub/themes/antergos/
+    cp artix-branding/artix-grub-theme/artix/slider_s.png $pkgdir/usr/share/grub/themes/antergos/
+    cp artix-branding/artix-grub-theme/artix/unifont.pf2 $pkgdir/usr/share/grub/themes/antergos/
+
+    # Copy Antergos OS icon and GRUB UI icons
+    cp grub2-theme-antergos/Antergos-Default/icons/antergos.png $pkgdir/usr/share/grub/themes/antergos/icons/
+    cp artix-branding/artix-grub-theme/artix/icons/* $pkgdir/usr/share/grub/themes/antergos/icons/
+
+    # Rename icon files for GRUB class matching
+    mv $pkgdir/usr/share/grub/themes/antergos/icons/artix.i686.png $pkgdir/usr/share/grub/themes/antergos/icons/antergos.i686.png 2>/dev/null || true
+    mv $pkgdir/usr/share/grub/themes/antergos/icons/artix.x86_64.png $pkgdir/usr/share/grub/themes/antergos/icons/antergos.x86_64.png 2>/dev/null || true
+
+    # Write theme.txt
+    cat > $pkgdir/usr/share/grub/themes/antergos/theme.txt << 'THEME'
+# Antergos GRUB theme
+desktop-image: "background.png"
+title-text: ""
+terminal-font: "Unifont Regular 16"
+
+ boot_menu {
+    left = 15%
+    top = 30%
+    width = 75%
+    height = 45%
+    item_font = "Unifont Regular 16"
+    item_color = "#f4f4f4"
+    selected_item_font = "Unifont Regular 16"
+    selected_item_color = "#62c0f8"
+    selected_item_pixmap_style = "highlight_*.png"
+    icon_height = 28
+    icon_width = 28
+    item_height = 32
+    item_padding = 0
+    item_icon_space = 32
+    item_spacing = 0
+    scrollbar = true
+    scrollbar_width = 32
+    scrollbar_thumb = "slider_*.png"
+    menu_pixmap_style = "menu_*.png"
+}
+THEME
+}
@@ -0,0 +1,58 @@
+# Maintainer: Antergos NeXT <antergos-next@github>
+
+_tag=0.14.1
+
+pkgbase=antergos-live
+pkgname=('antergos-live-base'
+        'antergos-live-openrc'
+        'antergos-grub-live')
+pkgver=2026.06
+pkgrel=1
+pkgdesc='Antergos live session'
+arch=('any')
+url="https://github.com/Antergos-NeXT/antergos-live"
+license=('GPL')
+makedepends=('git' 'bash' 'artools-base')
+source=("git+https://gitea.artixlinux.org/artix/artix-live.git#tag=$_tag")
+sha256sums=('SKIP')
+
+pkgver() {
+   date +%Y.%m
+}
+
+build() {
+    make -C artix-live
+    sed -i 's/artix/antergos/g; s/Artix/Antergos/g' \
+        artix-live/data/grub/cfg/kernels.cfg \
+        artix-live/data/grub/cfg/variable.cfg \
+        artix-live/data/grub/cfg/grub.cfg \
+        artix-live/data/grub/cfg/defaults.cfg \
+        artix-live/data/grub/cfg/loopback.cfg \
+        artix-live/data/live.conf 2>/dev/null || true
+}
+
+package_antergos-live-base() {
+    pkgdesc='Antergos live base scripts'
+    depends=('artools-base' 'bash')
+
+    make -C artix-live DESTDIR=${pkgdir} install_base install_xdg
+}
+
+package_antergos-live-openrc() {
+    pkgdesc='Antergos live openrc init scripts'
+    depends=('antergos-live-base')
+    provides=('init-antergos-live')
+    conflicts=('init-antergos-live' 'init-artix-live')
+
+    make -C artix-live DESTDIR=${pkgdir} install_rc
+
+    install -d "${pkgdir}"/etc/runlevels/default
+    ln -sf /etc/init.d/artix-live "${pkgdir}"/etc/runlevels/default/antergos-live
+    ln -sf /etc/init.d/pacman-init "${pkgdir}"/etc/runlevels/default/pacman-init
+}
+
+package_antergos-grub-live() {
+    pkgdesc='Antergos grub live'
+
+    make -C artix-live PREFIX=/usr DESTDIR=${pkgdir} install_grub
+}
@@ -0,0 +1,32 @@
+# Maintainer: Antergos NeXT <antergos-next@github>
+
+pkgname=antergos-release
+pkgver=2026.06
+pkgrel=1
+pkgdesc='Antergos NeXT release file'
+arch=('any')
+url="https://github.com/Antergos-NeXT"
+license=('GPL3')
+conflicts=('artix-release')
+provides=('os-release')
+
+package() {
+    install -dm755 $pkgdir/usr/lib
+    install -dm755 $pkgdir/etc
+    cat > $pkgdir/usr/lib/os-release << EOF
+NAME="Antergos NeXT"
+PRETTY_NAME="Antergos NeXT"
+ID=antergos
+ID_LIKE=artix
+BUILD_ID=rolling
+ANSI_COLOR="38;2;0;136;204"
+HOME_URL="https://github.com/Antergos-NeXT"
+DOCUMENTATION_URL="https://wiki.archlinux.org"
+SUPPORT_URL="https://github.com/Antergos-NeXT"
+BUG_REPORT_URL="https://github.com/Antergos-NeXT"
+LOGO=antergos-logo
+EOF
+    cp $pkgdir/usr/lib/os-release $pkgdir/etc/os-release
+}
+
+backup=('etc/os-release' 'usr/lib/os-release')
@@ -2,7 +2,7 @@

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

    local ShowInstallLog="FALSE"
    local ShowPacmanLog="FALSE"
-    local Home=/home/liveuser
+    local Home=/home/antergos
    local log=$Home/antergos-install.log
    local cfolder=/etc/calamares
    local workdir=""
@@ -25,7 +25,7 @@ sequence:
  - displaymanager
  - networkcfg
  - hwclock
-  - services-systemd
+  - services-openrc
  - grubcfg
  - bootloader
  - packages
@@ -26,7 +26,7 @@ sequence:
  - displaymanager
  - networkcfg
  - hwclock
-  - services-systemd
+  - services-openrc
  - grubcfg
  - bootloader
  - removeuser
@@ -58,7 +58,7 @@ Item {
        slides: [
            Dia {
                title: qsTr("Welcome to Antergos NeXT")
-                body: qsTr("A modern Arch Linux experience built on EndeavourOS")
+                body: qsTr("A modern Arch Linux experience with OpenRC and elogind")
                footer: qsTr("Choose your preferred desktop environment during setup")
            },
            Dia {