fix x86 bug

Ultramarine-Linux · Jul 7, 2024 · 5af5f55 · 5af5f55
1 parent 0bd0272
commit 5af5f55
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/katsu/modules/ports/chromebook/cleanup.sh b/katsu/modules/ports/chromebook/cleanup.sh
@@ -0,0 +1,23 @@
+#!/bin/bash -x
+
+systemctl disable systemd-networkd-wait-online systemd-networkd systemd-networkd.socket
+systemctl disable chronyd
+
+echo max_parallel_downloads=20 >> /etc/dnf/dnf.conf
+echo defaultyes=True >> /etc/dnf/dnf.conf
+
+# if aarch64
+
+arch=$(uname -m)
+if [[ $arch == "aarch64" ]]; then
+cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
+cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
+fi
+rm -f /var/lib/systemd/random-seed
+rm -f /etc/NetworkManager/system-connections/*.nmconnection
+
+rm -f /etc/machine-id
+touch /etc/machine-id
+
+rm -f /var/lib/rpm/__db*
diff --git a/katsu/modules/ports/chromebook/flagship.yaml → ...les/ports/chromebook/x86_64/flagship.yaml b/katsu/modules/ports/chromebook/flagship.yaml → ...les/ports/chromebook/x86_64/flagship.yaml
@@ -2,8 +2,8 @@ builder: dnf
 
 import:
   - chromebook.yaml
-  - ../../flagship/flagship.yaml
-  - ../../flagship/base-disk-aarch64.yaml
+  - ../../../flagship/flagship.yaml
+  - ../../../flagship/base-disk-x86_64.yaml
 
 distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
 

diff --git a/katsu/modules/ports/chromebook/gnome.yaml → ...odules/ports/chromebook/x86_64/gnome.yaml b/katsu/modules/ports/chromebook/gnome.yaml → ...odules/ports/chromebook/x86_64/gnome.yaml
@@ -2,8 +2,8 @@ builder: dnf
 
 import:
   - chromebook.yaml
-  - ../../gnome/gnome.yaml
-  - ../../gnome/base-disk-x86_64.yaml
+  - ../../../gnome/gnome.yaml
+  - ../../../gnome/base-disk-x86_64.yaml
 
 distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
 

diff --git a/katsu/modules/ports/chromebook/kde.yaml → .../modules/ports/chromebook/x86_64/kde.yaml b/katsu/modules/ports/chromebook/kde.yaml → .../modules/ports/chromebook/x86_64/kde.yaml
@@ -2,8 +2,8 @@ builder: dnf
 
 import:
   - chromebook.yaml
-  - ../../kde/kde.yaml
-  - ../../kde/base-disk-x86_64.yaml
+  - ../../../kde/kde.yaml
+  - ../../../kde/base-disk-x86_64.yaml
 
 distro: Ultramarine Linux 40 KDE (Chromebook Edition)
 

diff --git a/katsu/modules/ports/chromebook/xfce.yaml → ...modules/ports/chromebook/x86_64/xfce.yaml b/katsu/modules/ports/chromebook/xfce.yaml → ...modules/ports/chromebook/x86_64/xfce.yaml
@@ -2,8 +2,8 @@ builder: dnf
 
 import:
   - chromebook.yaml
-  - ../../xfce/xfce.yaml
-  - ../../xfce/base-disk-aarch64.yaml
+  - ../../../xfce/xfce.yaml
+  - ../../../xfce/base-disk-x86.yaml
 
 distro: Ultramarine Linux 40 Xfce (Chromebook Edition)