# This is a combination of 4 commits.

# This is the 1st commit message:

Add graphical installer to iso
Also update to latest upstream changes

# The commit message ChimeraOS#2 will be skipped:

# update upstream

# The commit message ChimeraOS#3 will be skipped:

# use sddm, gamescope-plus and gamescope-session. Also default to graphical target
# Hack in gamescope-session with own PKGBUILD

# The commit message ChimeraOS#4 will be skipped:

# use sddm, gamescope-plus and gamescope-session. Also default to graphical target
# Hack in gamescope-session with own PKGBUILD

.github/workflows/main.yml

@@ -3,9 +3,47 @@ on:
   push:
     branches:
     - 'master'
+    - 'upstream'
 jobs:
+  build-installer:
+    name: Build Graphical Installer
+    runs-on: ubuntu-latest
+
+    container:
+      image: archlinux:base-devel
+    steps:
+      - name: Set up pacman keyring
+        run: |
+          pacman-key --init
+          pacman-key --populate archlinux
+          mkdir -p /etc/gnupg && echo "auto-key-retrieve" >> /etc/gnupg/gpg.conf
+      - name: Install dependencies
+        run: |
+          pacman -Syu --noconfirm unzip godot wget git fontconfig
+      - name: Get latest graphical installer
+        run: |
+          git clone https://github.com/chimeraos/chimeraos-installer.git
+      - name: Build ChimeraOS installer
+        id: build
+        shell: bash
+        run: |
+          godot --version
+          cd chimeraos-installer
+          make build
+          cd build
+          ls -ahl
+          pwd
+      - name: Upload package artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: chimeraos-installer
+          path: |
+            chimeraos-installer/build/chimeraos-installer.x86_64
+          if-no-files-found: error
+
   build:
     name: Installer ISO build
+    needs: [build-installer]
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -17,6 +55,11 @@ jobs:
       - uses: actions/checkout@v3
       - name: Change directory
         run: cd $GITHUB_WORKSPACE
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: chimeraos-installer
+          path: chimeraos/airootfs/root/
       - name: Build ISO
         id: build_iso
         run: ./build-iso-docker.sh

build-iso.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
-
+set -e
+tree -l
 if [ $EUID -ne 0 ]; then
 	echo "$(basename $0) must be run as root"
 	exit 1
@@ -24,7 +25,6 @@ mkdir -p "${temp_dir}"
 AUR_PACKAGES="\
     frzr \
     gamescope-plus \
-    gamescope-session-git \
     rtl88x2bu-dkms-git \
     rtw89-dkms-git \
     r8152-dkms \
@@ -34,8 +34,8 @@ AUR_PACKAGES="\
 "
 
 ADDITIONAL_PACKAGES="\
-    https://github.com/ChimeraOS/linux-chimeraos/releases/download/v6.3.9-chos2/linux-chimeraos-6.3.9.chos2-1-x86_64.pkg.tar.zst \
-    https://github.com/ChimeraOS/linux-chimeraos/releases/download/v6.3.9-chos2/linux-chimeraos-headers-6.3.9.chos2-1-x86_64.pkg.tar.zst \
+    https://github.com/ChimeraOS/linux-chimeraos/releases/download/v6.5.5-chos4-1/linux-chimeraos-6.5.5.chos4-1-x86_64.pkg.tar.zst \
+    https://github.com/ChimeraOS/linux-chimeraos/releases/download/v6.5.5-chos4-1/linux-chimeraos-headers-6.5.5.chos4-1-x86_64.pkg.tar.zst \
 "
 
 # create repo directory if it doesn't exist yet
@@ -53,6 +53,17 @@ pushd /home/${BUILD_USER}
 "${PIKAUR_RUN[@]}"
 popd
 
+for package in /pkgs/*/; do
+	echo "Building ${package}"
+    chmod 777 ${package}
+	PIKAUR_CMD="PKGDEST=/tmp/temp_repo \
+		pikaur --noconfirm -S -P ${package}PKGBUILD"
+	PIKAUR_RUN=(su "${BUILD_USER}" -c "${PIKAUR_CMD}")
+    pushd /home/${BUILD_USER}
+	"${PIKAUR_RUN[@]}"
+    popd
+done
+
 # copy all built packages to the repo
 cp /tmp/temp_repo/* ${LOCAL_REPO}
 

chimeraos/airootfs/etc/hostname

@@ -1,3 +1,3 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
-chimeraos
+chimeraos-installer

chimeraos/airootfs/etc/mkinitcpio.conf.d/archiso.conf

@@ -0,0 +1,2 @@
+HOOKS=(base udev plymouth kms modconf archiso block filesystems)
+COMPRESSION="xz"

chimeraos/airootfs/etc/mkinitcpio.d/linux-chimeraos.preset

@@ -1,11 +1,8 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # mkinitcpio preset file for the 'linux' package on archiso
 
 PRESETS=('archiso')
 
 ALL_kver='/boot/vmlinuz-linux-chimeraos'
-ALL_config='/etc/mkinitcpio.conf'
+archiso_config='/etc/mkinitcpio.conf.d/archiso.conf'
 
 archiso_image="/boot/initramfs-linux-chimeraos.img"

chimeraos/airootfs/etc/sddm.conf.d/autologin.conf

@@ -0,0 +1,3 @@
+[Autologin]
+User=root
+Session=ChimeraOS Installer

chimeraos/airootfs/etc/ssh/sshd_config.d/10-archiso.conf

@@ -0,0 +1,3 @@
+# Allow root login using password authentication
+PasswordAuthentication yes
+PermitRootLogin yes