From 02237b293c34baf153b30c936c6bad142e61001a Mon Sep 17 00:00:00 2001 From: Lleyton Gray Date: Thu, 5 Sep 2024 23:15:01 -0700 Subject: [PATCH] fix: KDE to Plasma --- .github/workflows/build-katsu.yml | 10 +++++----- .../{kde => plasma}/base-disk-aarch64.yaml | 6 +++--- .../{kde => plasma}/base-disk-x86_64.yaml | 6 +++--- .../kde-disk.yaml => plasma/plasma-disk.yaml} | 0 .../{kde/kde-live.sh => plasma/plasma-live.sh} | 0 .../kde-live.yaml => plasma/plasma-live.yaml} | 12 ++++++------ .../{kde/kde.yaml => plasma/plasma.yaml} | 2 +- katsu/modules/ports/chromebook/mt8183/kde.yaml | 18 ------------------ .../ports/chromebook/mt8183/plasma.yaml | 18 ++++++++++++++++++ katsu/modules/ports/chromebook/mt8192/kde.yaml | 18 ------------------ .../ports/chromebook/mt8192/plasma.yaml | 18 ++++++++++++++++++ katsu/modules/ports/chromebook/sc7180/kde.yaml | 18 ------------------ .../ports/chromebook/sc7180/plasma.yaml | 18 ++++++++++++++++++ katsu/modules/ports/chromebook/stoney/kde.yaml | 18 ------------------ .../ports/chromebook/stoney/plasma.yaml | 18 ++++++++++++++++++ katsu/modules/ports/chromebook/x86_64/kde.yaml | 18 ------------------ .../ports/chromebook/x86_64/plasma.yaml | 18 ++++++++++++++++++ 17 files changed, 108 insertions(+), 108 deletions(-) rename katsu/modules/{kde => plasma}/base-disk-aarch64.yaml (90%) rename katsu/modules/{kde => plasma}/base-disk-x86_64.yaml (90%) rename katsu/modules/{kde/kde-disk.yaml => plasma/plasma-disk.yaml} (100%) rename katsu/modules/{kde/kde-live.sh => plasma/plasma-live.sh} (100%) rename katsu/modules/{kde/kde-live.yaml => plasma/plasma-live.yaml} (51%) rename katsu/modules/{kde/kde.yaml => plasma/plasma.yaml} (66%) delete mode 100644 katsu/modules/ports/chromebook/mt8183/kde.yaml create mode 100644 katsu/modules/ports/chromebook/mt8183/plasma.yaml delete mode 100644 katsu/modules/ports/chromebook/mt8192/kde.yaml create mode 100644 katsu/modules/ports/chromebook/mt8192/plasma.yaml delete mode 100644 katsu/modules/ports/chromebook/sc7180/kde.yaml create mode 100644 katsu/modules/ports/chromebook/sc7180/plasma.yaml delete mode 100644 katsu/modules/ports/chromebook/stoney/kde.yaml create mode 100644 katsu/modules/ports/chromebook/stoney/plasma.yaml delete mode 100644 katsu/modules/ports/chromebook/x86_64/kde.yaml create mode 100644 katsu/modules/ports/chromebook/x86_64/plasma.yaml diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml index 0b733ba6..f7239200 100644 --- a/.github/workflows/build-katsu.yml +++ b/.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 diff --git a/katsu/modules/kde/base-disk-aarch64.yaml b/katsu/modules/plasma/base-disk-aarch64.yaml similarity index 90% rename from katsu/modules/kde/base-disk-aarch64.yaml rename to katsu/modules/plasma/base-disk-aarch64.yaml index fbf734da..c305ffb2 100644 --- a/katsu/modules/kde/base-disk-aarch64.yaml +++ b/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: diff --git a/katsu/modules/kde/base-disk-x86_64.yaml b/katsu/modules/plasma/base-disk-x86_64.yaml similarity index 90% rename from katsu/modules/kde/base-disk-x86_64.yaml rename to katsu/modules/plasma/base-disk-x86_64.yaml index 7d162f47..d3fcb41c 100644 --- a/katsu/modules/kde/base-disk-x86_64.yaml +++ b/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: diff --git a/katsu/modules/kde/kde-disk.yaml b/katsu/modules/plasma/plasma-disk.yaml similarity index 100% rename from katsu/modules/kde/kde-disk.yaml rename to katsu/modules/plasma/plasma-disk.yaml diff --git a/katsu/modules/kde/kde-live.sh b/katsu/modules/plasma/plasma-live.sh similarity index 100% rename from katsu/modules/kde/kde-live.sh rename to katsu/modules/plasma/plasma-live.sh diff --git a/katsu/modules/kde/kde-live.yaml b/katsu/modules/plasma/plasma-live.yaml similarity index 51% rename from katsu/modules/kde/kde-live.yaml rename to katsu/modules/plasma/plasma-live.yaml index f5690e93..28405dc6 100644 --- a/katsu/modules/kde/kde-live.yaml +++ b/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 diff --git a/katsu/modules/kde/kde.yaml b/katsu/modules/plasma/plasma.yaml similarity index 66% rename from katsu/modules/kde/kde.yaml rename to katsu/modules/plasma/plasma.yaml index 050c25ff..ddfc055a 100644 --- a/katsu/modules/kde/kde.yaml +++ b/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" diff --git a/katsu/modules/ports/chromebook/mt8183/kde.yaml b/katsu/modules/ports/chromebook/mt8183/kde.yaml deleted file mode 100644 index 59931fe6..00000000 --- a/katsu/modules/ports/chromebook/mt8183/kde.yaml +++ /dev/null @@ -1,18 +0,0 @@ -builder: dnf - -import: - - mt8183.yaml - - ../../../kde/kde.yaml - - ../../../kde/base-disk-aarch64.yaml - -distro: Ultramarine Linux 41 KDE (mt8183 Chromebook) - -out_file: ultramarine-cbe-mt8183-kde-41.img - -bootloader: grub - -kernel_cmdline: "quiet rhgb" - -dnf: - releasever: 41 - exec: dnf4 diff --git a/katsu/modules/ports/chromebook/mt8183/plasma.yaml b/katsu/modules/ports/chromebook/mt8183/plasma.yaml new file mode 100644 index 00000000..b216d60c --- /dev/null +++ b/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 diff --git a/katsu/modules/ports/chromebook/mt8192/kde.yaml b/katsu/modules/ports/chromebook/mt8192/kde.yaml deleted file mode 100644 index ce837e58..00000000 --- a/katsu/modules/ports/chromebook/mt8192/kde.yaml +++ /dev/null @@ -1,18 +0,0 @@ -builder: dnf - -import: - - mt8192.yaml - - ../../../kde/kde.yaml - - ../../../kde/base-disk-aarch64.yaml - -distro: Ultramarine Linux 41 KDE (mt8192 Chromebook) - -out_file: ultramarine-cbe-mt8192-kde-41.img - -bootloader: grub - -kernel_cmdline: "quiet rhgb" - -dnf: - releasever: 41 - exec: dnf4 diff --git a/katsu/modules/ports/chromebook/mt8192/plasma.yaml b/katsu/modules/ports/chromebook/mt8192/plasma.yaml new file mode 100644 index 00000000..7a70ddb7 --- /dev/null +++ b/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 diff --git a/katsu/modules/ports/chromebook/sc7180/kde.yaml b/katsu/modules/ports/chromebook/sc7180/kde.yaml deleted file mode 100644 index 53d98d1b..00000000 --- a/katsu/modules/ports/chromebook/sc7180/kde.yaml +++ /dev/null @@ -1,18 +0,0 @@ -builder: dnf - -import: - - sc7180.yaml - - ../../../kde/kde.yaml - - ../../../kde/base-disk-aarch64.yaml - -distro: Ultramarine Linux 41 KDE (sc7180 Chromebook) - -out_file: ultramarine-cbe-sc7180-kde-41.img - -bootloader: grub - -kernel_cmdline: "quiet rhgb" - -dnf: - releasever: 41 - exec: dnf4 diff --git a/katsu/modules/ports/chromebook/sc7180/plasma.yaml b/katsu/modules/ports/chromebook/sc7180/plasma.yaml new file mode 100644 index 00000000..32e0fe8f --- /dev/null +++ b/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 diff --git a/katsu/modules/ports/chromebook/stoney/kde.yaml b/katsu/modules/ports/chromebook/stoney/kde.yaml deleted file mode 100644 index edddfc1e..00000000 --- a/katsu/modules/ports/chromebook/stoney/kde.yaml +++ /dev/null @@ -1,18 +0,0 @@ -builder: dnf - -import: - - stoney.yaml - - ../../../kde/kde.yaml - - ../../../kde/base-disk-x86_64.yaml - -distro: Ultramarine Linux 41 KDE (Stoney Chromebook) - -out_file: ultramarine-cbe-stoney-kde-41.img - -bootloader: grub - -kernel_cmdline: "quiet rhgb" - -dnf: - releasever: 41 - exec: dnf4 diff --git a/katsu/modules/ports/chromebook/stoney/plasma.yaml b/katsu/modules/ports/chromebook/stoney/plasma.yaml new file mode 100644 index 00000000..b45732d7 --- /dev/null +++ b/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 diff --git a/katsu/modules/ports/chromebook/x86_64/kde.yaml b/katsu/modules/ports/chromebook/x86_64/kde.yaml deleted file mode 100644 index edc77c66..00000000 --- a/katsu/modules/ports/chromebook/x86_64/kde.yaml +++ /dev/null @@ -1,18 +0,0 @@ -builder: dnf - -import: - - chromebook.yaml - - ../../../kde/kde.yaml - - ../../../kde/base-disk-x86_64.yaml - -distro: Ultramarine Linux 41 KDE (Chromebook Edition) - -out_file: ultramarine-cbe-kde-41.img - -bootloader: grub - -kernel_cmdline: "quiet rhgb" - -dnf: - releasever: 41 - exec: dnf4 diff --git a/katsu/modules/ports/chromebook/x86_64/plasma.yaml b/katsu/modules/ports/chromebook/x86_64/plasma.yaml new file mode 100644 index 00000000..e6e4197d --- /dev/null +++ b/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