feat: major Calamares overhaul — dracut migration, branding polish, online/offline installer split
=== Calamares (core) === - Unskip packagechooserq from _skip_modules so it compiles in - pkgrel 2→3 === Calamares Branding === branding.desc: - Blue Antergos color scheme (#4A9EFF accent, #20252B sidebar) - New Antergos logo/icon PNGs from cnchi assets - Larger window (860x540) - Fix sidebar/navigation to widget mode stylesheet.qss: - Blue-themed QSS with gradients, styled buttons/inputs/sidebar show.qml: - 6-slide Calamares slideshow: welcome, EndeavourOS base, DE list, Antergos tools, finishing, thank-you (dark slide) dracut migration: - dracut.conf (NEW): initramfsName for dracut module compatibility - Remove mkinitcpio reference, dracut handles initramfs generation === Online/Offline Installer Split === Problem: unpackfs (GNOME squashfs) + netinstall (selected DE) installs two DEs — wasteful and messy. Solution: Two entirely separate Calamares configurations. settings_offline.conf (NEW): - Traditional unpackfs path, no netinstall steps - Installs GNOME from pre-built squashfs (current behavior) - Used by default `calamares` or via `calamares -c /etc/calamares-offline` settings_online.conf (NEW): - No unpackfs — everything installed from internet via netinstall - netinstall in both show (DE selection) and exec (package install) - Base system + Antergos packages as hidden/immutable groups - Used via `calamares -c /etc/calamares-online` netinstall.yaml (NEW): - Base System (hidden, immutable): kernel, base, firmware, network - Antergos Packages (hidden, immutable): wallpapers, welcome, yay, calamares - 8 Desktop Environments: KDE, GNOME, Xfce, Budgie, Cinnamon, MATE, LXQt, i3/Sway - Hardware Support group: GPU drivers, vulkan, pipewire netinstall.conf (NEW): groupsUrl pointing to netinstall.yaml welcome.conf (NEW): internet check (informational), 8GB storage/2GB RAM/power required calamares-next.sh (NEW): Launcher script — zenity/kdialog/dialog choice between Offline and Online, runs Calamares with the right config. Checks internet connectivity before starting online install. PKGBUILD install layout: - Branding shared at /usr/share/calamares/branding/antergos-next/ - Modules shared at /etc/calamares/modules/ - /etc/calamares-offline/ — settings.conf for offline - /etc/calamares-online/ — settings.conf for online - /etc/calamares/settings.conf → symlink to offline (default) - /usr/bin/calamares-next — launcher script === Antergos Welcome === PKGBUILD: copy data/preferences.json to package root (fixes runtime preferences loading in subdirectory layout)
This commit is contained in:
@@ -2,76 +2,71 @@
|
||||
|
||||
pkgname=calamares-branding-antergos-next
|
||||
pkgver=1.0
|
||||
pkgrel=2
|
||||
pkgdesc="Minimal Calamares branding for Antergos NeXT"
|
||||
pkgrel=5
|
||||
pkgdesc="Calamares branding for Antergos NeXT with offline/online installer support"
|
||||
arch=('any')
|
||||
url="https://github.com/Antergos-NeXT"
|
||||
license=('GPL3')
|
||||
depends=('calamares')
|
||||
optdepends=('zenity: graphical mode chooser dialog')
|
||||
source=("branding.desc"
|
||||
"stylesheet.qss"
|
||||
"show.qml")
|
||||
"show.qml"
|
||||
"unpackfs.conf"
|
||||
"dracut.conf"
|
||||
"antergos-logo.png"
|
||||
"antergos-icon.png"
|
||||
"netinstall.yaml"
|
||||
"netinstall.conf"
|
||||
"welcome.conf"
|
||||
"settings_offline.conf"
|
||||
"settings_online.conf"
|
||||
"calamares-next.sh")
|
||||
sha256sums=('SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP')
|
||||
|
||||
package() {
|
||||
# Branding data (shared between offline/online)
|
||||
local _brand="/usr/share/calamares/branding/antergos-next"
|
||||
install -dm755 "${pkgdir}${_brand}"
|
||||
|
||||
cp "branding.desc" "${pkgdir}${_brand}/"
|
||||
cp "stylesheet.qss" "${pkgdir}${_brand}/"
|
||||
cp "show.qml" "${pkgdir}${_brand}/"
|
||||
cp "antergos-logo.png" "${pkgdir}${_brand}/"
|
||||
cp "antergos-icon.png" "${pkgdir}${_brand}/"
|
||||
|
||||
# Symlink Antergos logo from cnchi or wallpapers
|
||||
# Use antergos-icon from system if available
|
||||
# Shared Calamares modules
|
||||
install -dm755 "${pkgdir}/etc/calamares/modules"
|
||||
cp "unpackfs.conf" "${pkgdir}/etc/calamares/modules/"
|
||||
cp "dracut.conf" "${pkgdir}/etc/calamares/modules/"
|
||||
cp "netinstall.conf" "${pkgdir}/etc/calamares/modules/"
|
||||
cp "netinstall.yaml" "${pkgdir}/etc/calamares/modules/"
|
||||
cp "welcome.conf" "${pkgdir}/etc/calamares/modules/"
|
||||
|
||||
# Offline config directory
|
||||
install -dm755 "${pkgdir}/etc/calamares-offline"
|
||||
cp "settings_offline.conf" "${pkgdir}/etc/calamares-offline/settings.conf"
|
||||
|
||||
# Online config directory
|
||||
install -dm755 "${pkgdir}/etc/calamares-online"
|
||||
cp "settings_online.conf" "${pkgdir}/etc/calamares-online/settings.conf"
|
||||
|
||||
# Default: offline mode (for direct calamares launch)
|
||||
install -dm755 "${pkgdir}/etc/calamares"
|
||||
cat > "${pkgdir}/etc/calamares/settings.conf" << 'CONF'
|
||||
---
|
||||
modules-search: [ local ]
|
||||
ln -sf "../calamares-offline/settings.conf" "${pkgdir}/etc/calamares/settings.conf"
|
||||
|
||||
sequence:
|
||||
- show:
|
||||
- welcome
|
||||
- locale
|
||||
- keyboard
|
||||
- partition
|
||||
- users
|
||||
- summary
|
||||
- exec:
|
||||
- partition
|
||||
- mount
|
||||
- unpackfs
|
||||
- machineid
|
||||
- fstab
|
||||
- locale
|
||||
- keyboard
|
||||
- localecfg
|
||||
- luksbootkeyfile
|
||||
- luksopenswaphookcfg
|
||||
- initcpiocfg
|
||||
- initcpio
|
||||
- users
|
||||
- displaymanager
|
||||
- networkcfg
|
||||
- hwclock
|
||||
- services-systemd
|
||||
- grubcfg
|
||||
- bootloader
|
||||
- packages
|
||||
- removeuser
|
||||
- umount
|
||||
- show:
|
||||
- finished
|
||||
|
||||
branding: antergos-next
|
||||
|
||||
prompt-install: false
|
||||
dont-chroot: false
|
||||
oem-setup: false
|
||||
disable-cancel: false
|
||||
disable-cancel-during-exec: false
|
||||
hide-back-and-next-during-exec: false
|
||||
quit-at-end: false
|
||||
CONF
|
||||
# Launcher script
|
||||
install -dm755 "${pkgdir}/usr/bin"
|
||||
install -m755 "calamares-next.sh" "${pkgdir}/usr/bin/calamares-next"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user