From d186567f7981d9435ff6e0598cd97e987a5c5dcf Mon Sep 17 00:00:00 2001 From: Owen Zimmerman Date: Fri, 3 Jan 2025 22:11:45 -0600 Subject: [PATCH 1/4] Fix up ARM chromebooks --- .../ports/chromebook/mt8183/mt8183.yaml | 26 ++++++++++++++++++- .../ports/chromebook/mt8192/mt8192.yaml | 26 ++++++++++++++++++- .../modules/ports/chromebook/sc7180/readme.md | 2 -- .../ports/chromebook/sc7180/sc7180.yaml | 26 +++++++++++++++++++ 4 files changed, 76 insertions(+), 4 deletions(-) diff --git a/katsu/modules/ports/chromebook/mt8183/mt8183.yaml b/katsu/modules/ports/chromebook/mt8183/mt8183.yaml index 3c394c2b..27134ed6 100644 --- a/katsu/modules/ports/chromebook/mt8183/mt8183.yaml +++ b/katsu/modules/ports/chromebook/mt8183/mt8183.yaml @@ -5,7 +5,31 @@ import: dnf: releasever: 41 - exec: dnf4 + arch: aarch64 packages: - kernel-mt8183 - kernel-mt8183-devel + - ultramarine-backgrounds + +disk: + size: 16GB + partitions: + - label: Submarine + type: fe3a2a5d-4f32-41a7-b725-accc3285a309 + size: 64MB + filesystem: fat + mountpoint: /submarine + + - label: boot + type: xbootldr + size: 1.1GB + filesystem: ext4 + mountpoint: /boot + + - label: root + flags: + - grow-fs + type: root + # size: 2.5MB + filesystem: btrfs + mountpoint: / diff --git a/katsu/modules/ports/chromebook/mt8192/mt8192.yaml b/katsu/modules/ports/chromebook/mt8192/mt8192.yaml index 2e2da8c1..b1d4d192 100644 --- a/katsu/modules/ports/chromebook/mt8192/mt8192.yaml +++ b/katsu/modules/ports/chromebook/mt8192/mt8192.yaml @@ -5,7 +5,31 @@ import: dnf: releasever: 41 - exec: dnf4 + arch: aarch64 packages: - kernel-mt8192 - kernel-mt8192-devel + - ultramarine-backgrounds + +disk: + size: 16GB + partitions: + - label: Submarine + type: fe3a2a5d-4f32-41a7-b725-accc3285a309 + size: 64MB + filesystem: fat + mountpoint: /submarine + + - label: boot + type: xbootldr + size: 1.1GB + filesystem: ext4 + mountpoint: /boot + + - label: root + flags: + - grow-fs + type: root + # size: 2.5MB + filesystem: btrfs + mountpoint: / diff --git a/katsu/modules/ports/chromebook/sc7180/readme.md b/katsu/modules/ports/chromebook/sc7180/readme.md index dff91f8d..f6ceba7c 100644 --- a/katsu/modules/ports/chromebook/sc7180/readme.md +++ b/katsu/modules/ports/chromebook/sc7180/readme.md @@ -3,5 +3,3 @@ Our reference device is the Lenovo IdeaPad Duet 3 (wormdingler) ## Known Issues - -- WiFi may be flaky. diff --git a/katsu/modules/ports/chromebook/sc7180/sc7180.yaml b/katsu/modules/ports/chromebook/sc7180/sc7180.yaml index e03f65c6..3611ac1f 100644 --- a/katsu/modules/ports/chromebook/sc7180/sc7180.yaml +++ b/katsu/modules/ports/chromebook/sc7180/sc7180.yaml @@ -9,3 +9,29 @@ dnf: packages: - kernel-sc7180 - kernel-sc7180-devel + - terra-msm-cros-efs-loader + - ultramarine-backgrounds + - linux-firmware-trogdor + +disk: + size: 16GB + partitions: + - label: Submarine + type: fe3a2a5d-4f32-41a7-b725-accc3285a309 + size: 64MB + filesystem: fat + mountpoint: /submarine + + - label: boot + type: xbootldr + size: 1.1GB + filesystem: ext4 + mountpoint: /boot + + - label: root + flags: + - grow-fs + type: root + # size: 2.5MB + filesystem: btrfs + mountpoint: / \ No newline at end of file From 932c945cec6ab283f7cc92dd5575f5e2a41ec731 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman Date: Fri, 3 Jan 2025 22:13:52 -0600 Subject: [PATCH 2/4] exec dnf4, buildarch aarch for sc7180 --- katsu/modules/ports/chromebook/mt8183/mt8183.yaml | 1 + katsu/modules/ports/chromebook/mt8192/mt8192.yaml | 1 + katsu/modules/ports/chromebook/sc7180/sc7180.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/katsu/modules/ports/chromebook/mt8183/mt8183.yaml b/katsu/modules/ports/chromebook/mt8183/mt8183.yaml index 27134ed6..8bb4b950 100644 --- a/katsu/modules/ports/chromebook/mt8183/mt8183.yaml +++ b/katsu/modules/ports/chromebook/mt8183/mt8183.yaml @@ -5,6 +5,7 @@ import: dnf: releasever: 41 + exec: dnf4 arch: aarch64 packages: - kernel-mt8183 diff --git a/katsu/modules/ports/chromebook/mt8192/mt8192.yaml b/katsu/modules/ports/chromebook/mt8192/mt8192.yaml index b1d4d192..fc220ff0 100644 --- a/katsu/modules/ports/chromebook/mt8192/mt8192.yaml +++ b/katsu/modules/ports/chromebook/mt8192/mt8192.yaml @@ -5,6 +5,7 @@ import: dnf: releasever: 41 + exec: dnf4 arch: aarch64 packages: - kernel-mt8192 diff --git a/katsu/modules/ports/chromebook/sc7180/sc7180.yaml b/katsu/modules/ports/chromebook/sc7180/sc7180.yaml index 3611ac1f..80baeaa8 100644 --- a/katsu/modules/ports/chromebook/sc7180/sc7180.yaml +++ b/katsu/modules/ports/chromebook/sc7180/sc7180.yaml @@ -6,6 +6,7 @@ import: dnf: releasever: 41 exec: dnf4 + arch: aarch64 packages: - kernel-sc7180 - kernel-sc7180-devel From 11592b12b37b8467af5276b437160a9ed9023ec9 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman Date: Sun, 5 Jan 2025 19:48:19 -0600 Subject: [PATCH 3/4] update ci for chromebooks --- .github/workflows/build-katsu.yml | 32 +++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml index 393815de..c1016666 100644 --- a/.github/workflows/build-katsu.yml +++ b/.github/workflows/build-katsu.yml @@ -63,20 +63,32 @@ jobs: - gnome/base-disk - plasma/base-disk - xfce/base-disk - #- ports/chromebook/flagship - #- ports/chromebook/gnome - #- ports/chromebook/plasma - #- ports/chromebook/xfce + - ports/chromebook/x86_64/flagship + - ports/chromebook/x86_64/gnome + - ports/chromebook/x86_64/plasma + - ports/chromebook/x86_64/xfce + - ports/chromebook/mt8183/flagship + - ports/chromebook/mt8183/gnome + - ports/chromebook/mt8183/plasma + - ports/chromebook/mt8183/xfce + - ports/chromebook/mt8192/flagship + - ports/chromebook/mt8192/gnome + - ports/chromebook/mt8192/plasma + - ports/chromebook/mt8192/xfce + - ports/chromebook/sc7180/flagship + - ports/chromebook/sc7180/gnome + - ports/chromebook/sc7180/plasma + - ports/chromebook/sc7180/xfce # TODO: figure out how to get loop devices to work on our ARM runners exclude: - arch: aarch64 - variant: flagship/flagship-chromebook + variant: ports/chromebook/x86_64/flagship - arch: aarch64 - variant: gnome/gnome-chromebook + variant: ports/chromebook/x86_64/gnome - arch: aarch64 - variant: plasma/plasma-chromebook + variant: ports/chromebook/x86_64/plasma - arch: aarch64 - variant: xfce/xfce-chromebook + variant: ports/chromebook/x86_64/xfce runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }} container: image: ghcr.io/terrapkg/builder:f41 @@ -139,6 +151,10 @@ jobs: - gnome/gnome-live-anaconda - plasma/plasma-live-anaconda - xfce/xfce-live-anaconda + - ports/chromebook/x86_64/flagship + - ports/chromebook/x86_64/gnome + - ports/chromebook/x86_64/plasma + - ports/chromebook/x86_64/xfce runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }} container: image: ghcr.io/terrapkg/builder:f41 From 59dadca5e7e7a895aa4bcefd59c9d3b58428fce7 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman Date: Sun, 5 Jan 2025 20:00:24 -0600 Subject: [PATCH 4/4] exclude more chromebook stuff --- .github/workflows/build-katsu.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml index c1016666..78c2b968 100644 --- a/.github/workflows/build-katsu.yml +++ b/.github/workflows/build-katsu.yml @@ -89,6 +89,30 @@ jobs: variant: ports/chromebook/x86_64/plasma - arch: aarch64 variant: ports/chromebook/x86_64/xfce + - arch: x86_64 + variant: ports/chromebook/mt8183/flagship + - arch: x86_64 + variant: ports/chromebook/mt8183/gnome + - arch: x86_64 + variant: ports/chromebook/mt8183/plasma + - arch: x86_64 + variant: ports/chromebook/mt8183/xfce + - arch: x86_64 + variant: ports/chromebook/mt8192/flagship + - arch: x86_64 + variant: ports/chromebook/mt8192/gnome + - arch: x86_64 + variant: ports/chromebook/mt8192/plasma + - arch: x86_64 + variant: ports/chromebook/mt8192/xfce + - arch: x86_64 + variant: ports/chromebook/sc7180/flagship + - arch: x86_64 + variant: ports/chromebook/sc7180/gnome + - arch: x86_64 + variant: ports/chromebook/sc7180/plasma + - arch: x86_64 + variant: ports/chromebook/sc7180/xfce runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }} container: image: ghcr.io/terrapkg/builder:f41