Merge pull request #41 from Ultramarine-Linux/fix/kde-to-plasma

fix: KDE to Plasma

.github/workflows/build-katsu.yml

@@ -61,11 +61,11 @@ 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/plasma
           #- ports/chromebook/xfce
           # TODO: figure out how to get loop devices to work on our ARM runners
         exclude:
@@ -74,7 +74,7 @@ jobs:
           - arch: aarch64
             variant: gnome/gnome-chromebook
           - arch: aarch64
-            variant: kde/kde-chromebook
+            variant: plasma/plasma-chromebook
           - arch: aarch64
             variant: xfce/xfce-chromebook
     runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }}
@@ -133,9 +133,9 @@ jobs:
         variant:
           - flagship/flagship-live
           - gnome/gnome-live
-          - kde/kde-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' && matrix.variant == 'plasma/plasma-live' && 'x86-64-lg' || matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }}
     container:
       image: ghcr.io/terrapkg/builder:f41
       # Pass /dev from host to container

katsu/modules/kde/base-disk-aarch64.yaml → katsu/modules/plasma/base-disk-aarch64.yaml

@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 41 (KDE Edition)
+distro: Ultramarine Linux 41 (Plasma Edition)
 
 # users:
 #   - username: ultramarine
@@ -11,8 +11,8 @@ distro: Ultramarine Linux 41 (KDE Edition)
 import:
   - ../base/base.yaml
   - ../base/base-disk.yaml
-  - kde.yaml
-  - kde-disk.yaml
+  - plasma.yaml
+  - plasma-disk.yaml
 
 scripts:
   post:

katsu/modules/kde/base-disk-x86_64.yaml → katsu/modules/plasma/base-disk-x86_64.yaml

@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 41 (KDE Edition)
+distro: Ultramarine Linux 41 (Plasma Edition)
 
 # users:
 #   - username: ultramarine
@@ -11,8 +11,8 @@ distro: Ultramarine Linux 41 (KDE Edition)
 import:
   - ../base/base.yaml
   - ../base/base-disk.yaml
-  - kde.yaml
-  - kde-disk.yaml
+  - plasma.yaml
+  - plasma-disk.yaml
 
 scripts:
   post:

katsu/modules/kde/kde-live.yaml → katsu/modules/plasma/plasma-live.yaml

@@ -3,17 +3,17 @@ builder: dnf
 import:
   - ../base/base.yaml
   - ../live/live.yaml
-  - kde.yaml
+  - plasma.yaml
 
-distro: Ultramarine Linux 41 (KDE Edition)
+distro: Ultramarine Linux 41 (Plasma Edition)
 
-out_file: ultramarine-kde-41-live.iso
+out_file: ultramarine-plasma-41-live.iso
 
 scripts:
   post:
-    - id: kde-live
-      name: Set up KDE Live
-      file: ./kde-live.sh
+    - id: plasma-live
+      name: Set up Plasma Live
+      file: ./plasma-live.sh
 
 bootloader: grub
 

katsu/modules/kde/kde.yaml → katsu/modules/plasma/plasma.yaml

@@ -3,4 +3,4 @@ dnf:
   exec: dnf4
   packages:
     #beta - still need to set up our own comps
-    - "@ultramarine-kde-product-environment"
+    - "@ultramarine-plasma-product-environment"

katsu/modules/ports/chromebook/mt8183/plasma.yaml

@@ -0,0 +1,18 @@
+builder: dnf
+
+import:
+  - mt8183.yaml
+  - ../../../plasma/plasma.yaml
+  - ../../../plasma/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 41 Plasma (mt8183 Chromebook)
+
+out_file: ultramarine-cbe-mt8183-plasma-41.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 41
+  exec: dnf4

katsu/modules/ports/chromebook/mt8192/plasma.yaml

@@ -0,0 +1,18 @@
+builder: dnf
+
+import:
+  - mt8192.yaml
+  - ../../../plasma/plasma.yaml
+  - ../../../plasma/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 41 Plasma (mt8192 Chromebook)
+
+out_file: ultramarine-cbe-mt8192-plasma-41.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 41
+  exec: dnf4

katsu/modules/ports/chromebook/sc7180/plasma.yaml

@@ -0,0 +1,18 @@
+builder: dnf
+
+import:
+  - sc7180.yaml
+  - ../../../plasma/plasma.yaml
+  - ../../../plasma/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 41 Plasma (sc7180 Chromebook)
+
+out_file: ultramarine-cbe-sc7180-plasma-41.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 41
+  exec: dnf4

katsu/modules/ports/chromebook/stoney/plasma.yaml

@@ -0,0 +1,18 @@
+builder: dnf
+
+import:
+  - stoney.yaml
+  - ../../../plasma/plasma.yaml
+  - ../../../plasma/plasma-disk-x86_64.yaml
+
+distro: Ultramarine Linux 41 Plasma (Stoney Chromebook)
+
+out_file: ultramarine-cbe-stoney-plasma-41.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 41
+  exec: dnf4

katsu/modules/ports/chromebook/x86_64/plasma.yaml

@@ -0,0 +1,18 @@
+builder: dnf
+
+import:
+  - chromebook.yaml
+  - ../../../plasma/plasma.yaml
+  - ../../../plasma/base-disk-x86_64.yaml
+
+distro: Ultramarine Linux 41 Plasma (Chromebook Edition)
+
+out_file: ultramarine-cbe-plasma-41.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 41
+  exec: dnf4