maybe fix chromebooks?

.github/workflows/build-katsu.yml

@@ -38,15 +38,15 @@ env:
     podman
     buildah
     katsu
-    https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-40.noarch.rpm
-    https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-40.noarch.rpm
+    https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-41.noarch.rpm
+    https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-41.noarch.rpm
 
 on:
   push:
-    branches: ["um40"]
+    branches: ["um41", "jade/chromebook-fixes"]
   workflow_dispatch:
   pull_request:
-    branches: ["um40"]
+    branches: ["um41"]
 
 jobs:
   #### BASE IMAGES ####
@@ -61,25 +61,36 @@ jobs:
           - base/base-disk
           - flagship/base-disk
           - gnome/base-disk
-          - kde/base-disk
+          - plasma/base-disk
           - xfce/base-disk
-          #- ports/chromebook/flagship
-          #- ports/chromebook/gnome
-          #- ports/chromebook/kde
-          #- ports/chromebook/xfce
+          - ports/chromebook/sc7180/sc7180
+          - ports/chromebook/flagship
+          - ports/chromebook/gnome
+          - ports/chromebook/plasma
+          - ports/chromebook/xfce
           # TODO: figure out how to get loop devices to work on our ARM runners
         exclude:
           - arch: aarch64
             variant: flagship/flagship-chromebook
           - arch: aarch64
             variant: gnome/gnome-chromebook
           - arch: aarch64
-            variant: kde/kde-chromebook
+            variant: plasma/plasma-chromebook
           - arch: aarch64
             variant: xfce/xfce-chromebook
+          - arch: aarch64
+            variant: ports/chromebook/flagship
+          - arch: aarch64
+            variant: ports/chromebook/plasma
+          - arch: aarch64
+            variant: ports/chromebook/gnome
+          - arch: aarch64
+            variant: ports/chromebook/xfce
+          - arch: x86_64
+            variant: ports/chromebook/sc7180/sc7180
     runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }}
     container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f41
       # Pass /dev from host to container
       # Very hacky, but it works
       # Microsoft/Github, if you're reading this,
@@ -89,6 +100,7 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
+          dnf up -y
           dnf install -y $DNF_PKGS
           dnf clean all
       - name: Checkout
@@ -120,6 +132,7 @@ jobs:
         with:
           name: ${{ env.artifact }}-image
           path: katsu/katsu-work/image/*.img.zst
+          compression-level: 0
 
   live-iso:
     strategy:
@@ -131,12 +144,11 @@ jobs:
         variant:
           - flagship/flagship-live
           - gnome/gnome-live
-          - kde/kde-live
-          #- pantheon/pantheon-live
+          - plasma/plasma-live
           - xfce/xfce-live
-    runs-on: ${{ matrix.arch == 'x86_64' && matrix.variant == 'kde/kde-live' && 'x86-64-lg' || matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }}
+    runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }}
     container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f41
       # Pass /dev from host to container
       # Very hacky, but it works
       # Microsoft/Github, if you're reading this,
@@ -146,6 +158,7 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
+          dnf up -y
           dnf install -y $DNF_PKGS
           dnf clean all
       - name: sanitize artifact name
@@ -169,7 +182,7 @@ jobs:
           rm -rf /etc/rpm/macros.image-language-conf
           chcon system_u:object_r:install_exec_t:s0 "$(which katsu)"
           pushd katsu
-          KATSU_LOG=trace katsu -v --output=iso "modules/${{ matrix.variant }}.yaml"
+          KATSU_KEEP_CHROOT=1 KATSU_LOG=trace katsu -v --output=iso "modules/${{ matrix.variant }}.yaml"
           # get the ISO name, and then append the arch
           # e.g. flagship-live.iso -> flagship-live-x86_64.iso
 
@@ -186,17 +199,81 @@ jobs:
         with:
           name: ${{ env.artifact }}-iso
           path: katsu/*.iso
+          compression-level: 0
+
+  tar:
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - x86_64
+          - aarch64
+        variant:
+          - wsl/wsl
+    runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }}
+    container:
+      image: ghcr.io/terrapkg/builder:f41
+      # Pass /dev from host to container
+      # Very hacky, but it works
+      # Microsoft/Github, if you're reading this,
+      # I'm sorry.
+      options: --privileged -v /dev:/dev
+    steps:
+      - name: Install dependencies
+        run: |
+          dnf up -y
+          dnf install -y $DNF_PKGS
+          dnf clean all
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: sanitize artifact name
+        run: |
+          name=$(echo ${{ matrix.variant }} | sed 's/\//-/g')
+          name=$name-${{ matrix.arch }}
+
+          # set github variable
+          echo artifact=$name >> $GITHUB_ENV
+          # Get architecture
+          # e.g. base/base-disk-x86_64 -> x86_64
+          echo arch=$(echo ${{ matrix.variant }} | cut -d'-' -f3) >> $GITHUB_ENV
+
+      - name: ${{ env.KATSU_BUILD_TASK_NAME }}
+        run: |
+          rm -rf /etc/rpm/macros.image-language-conf
+          chcon system_u:object_r:install_exec_t:s0 "$(which katsu)"
+          pushd katsu
+          KATSU_LOG=trace katsu -v --output=fs "modules/${{ matrix.variant }}.yaml"
+          tar -cJf katsu-work/chroot.tar katsu-work/chroot
+          mv katsu-work/chroot.tar katsu-work/${{ env.artifact }}.tar
+          # compress tar as zst, output as .tar.zst
+          # have an exception for WSL, as it doesn't support zstd
+          if [ "${{ matrix.variant }}" = "wsl/wsl" ]; then
+            gzip -9 -c katsu-work/${{ env.artifact }}.tar > katsu-work/${{ env.artifact }}.tar.gz
+          else
+            zstd -T0 -19 katsu-work/${{ env.artifact }}.tar -o katsu-work/${{ env.artifact }}.tar.zst
+          fi
+          popd
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.artifact }}-tar
+          path: |
+            katsu/katsu-work/*.tar.zst
+            katsu/katsu-work/*.tar.gz
+          compression-level: 0
 
   #### LIVE ISO PUSH ####
 
   push-image:
     runs-on: arm64
     container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f41
     environment: production
     needs:
       - live-iso
       - image
+      - tar
     if: github.event_name != 'pull_request'
 
     steps:
@@ -224,7 +301,7 @@ jobs:
             type=$2
 
 
-            IMAGEDIR=images/$type/ultramarine/40/
+            IMAGEDIR=images/$type/ultramarine/41/
             mkdir -p $IMAGEDIR
 
             filename=$(basename -- "$file")
@@ -247,6 +324,13 @@ jobs:
             fi
           done
 
+          for file in artifacts/*-tar/*; do
+            # if is file
+            if [ -f "$file" ]; then
+              pack_image $file images
+            fi
+          done
+
       - name: Upload to R2
         run: |
           wget https://dl.min.io/client/mc/release/linux-arm64/mc

katsu/modules/base/base-disk-aarch64.yaml

@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40
+distro: Ultramarine Linux 41
 
 # users:
 #   - username: ultramarine
@@ -13,7 +13,8 @@ import:
   - base-disk.yaml
 
 dnf:
-  releasever: 40
+  releasever: 41
+  exec: dnf4
   arch: aarch64
   packages:
     - ultramarine-release-identity-basic

katsu/modules/base/base-disk-nokernel.yaml

@@ -0,0 +1,68 @@
+scripts:
+  post:
+    - id: initial-setup
+      name: Enable Initial Setup
+      file: initial-setup.sh
+    - id: disk-setup
+      name: Extra configuration for disk images
+      file: disk-setup.sh
+dnf:
+  releasever: 40
+  options:
+    - --setopt=cachedir=/var/cache/dnf
+    - --setopt=keepcache=True
+    - --setopt=tsflags=
+    - --setopt=max_parallel_downloads=20
+  exclude:
+    - fedora-release*
+    - generic-release*
+    - kernel
+    - kernel-core
+    - kernel-devel
+  packages:
+    - initial-setup-gui
+    - filesystem
+    - setup
+    - lvm2
+    - btrfs-progs
+    - dmraid
+    - nvme-cli
+    - glibc
+    - glibc-common
+    - dracut-config-generic
+    - dracut-tools
+    - dnf
+    - dracut
+    # - mkpasswd # maybe not needed soon
+    - "@core"
+    - "@standard"
+    - grub2-tools
+    - "@hardware-support"
+    - NetworkManager
+    - rpm
+    - libgomp
+    - fedora-repos
+    - efibootmgr
+    - ultramarine-raw-filesystem
+    - plymouth
+    - plymouth-system-theme
+    - plymouth-theme-spinner
+
+  arch_packages:
+    aarch64:
+      - grub2-efi-aa64
+      - grub2-efi-aa64-modules
+      - grub2-efi-aa64-cdboot
+      - shim-aa64
+      - shim-unsigned-aarch64
+      - bcm283x-firmware
+      - bcm283x-overlays
+      - "@arm-tools"
+    x86_64:
+      - grub2-efi-x64
+      - grub2-efi-x64-modules
+      - grub2-efi-x64-cdboot
+      - grub2-pc
+      - grub2-pc-modules
+      - shim-x64
+      - shim-unsigned-x64

katsu/modules/base/base-disk-x86_64.yaml

@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40
+distro: Ultramarine Linux 41
 
 # users:
 #   - username: ultramarine
@@ -13,7 +13,8 @@ import:
   - base-disk.yaml
 
 dnf:
-  releasever: 40
+  releasever: 41
+  exec: dnf4
   packages:
     - ultramarine-release-identity-basic
     - ultramarine-release-basic

katsu/modules/base/base-disk.yaml

@@ -7,7 +7,8 @@ scripts:
       name: Extra configuration for disk images
       file: disk-setup.sh
 dnf:
-  releasever: 40
+  releasever: 41
+  exec: dnf4
   options:
     - --setopt=cachedir=/var/cache/dnf
     - --setopt=keepcache=True

katsu/modules/base/base-docker-aarch64.yaml

@@ -1,9 +1,10 @@
 builder: dnf
-distro: Ultramarine Linux 40 Container
+distro: Ultramarine Linux 41 Container
 
 import:
   - base-docker.yaml
 
 dnf:
-  releasever: 40
+  releasever: 41
+  exec: dnf4
   arch: aarch64

katsu/modules/base/base-docker-x86_64.yaml

@@ -1,9 +1,10 @@
 builder: dnf
-distro: Ultramarine Linux 40 Container
+distro: Ultramarine Linux 41 Container
 
 import:
   - base-docker.yaml
 
 dnf:
-  releasever: 40
+  releasever: 41
+  exec: dnf4
   arch: x86_64

katsu/modules/base/base-docker.yaml

@@ -2,7 +2,8 @@ builder: dnf
 
 dnf:
   repodir: repodir/
-  releasever: 40
+  releasever: 41
+  exec: dnf4
   options:
     - --setopt=cachedir=/var/cache/dnf
     - --setopt=keepcache=True

katsu/modules/base/base.yaml

@@ -13,7 +13,8 @@ scripts:
       file: buildstamp.sh
 
 dnf:
-  releasever: 40
+  releasever: 41
+  exec: dnf4
   repodir: repodir
   options:
     - --setopt=cachedir=/var/cache/dnf
@@ -76,4 +77,3 @@ dnf:
 #     - ultramarine-release
 #     - ultramarine-repos
 #     - "ultramarine-logos*"
-