From 6bedd927b009d4a2ef77f43bd3fdd8d8ebf72475 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Tue, 30 Apr 2024 10:31:37 +0530
Subject: [PATCH] remove asahi-specific stuff

---
 builder.py                       |  3 ---
 components/base.xml              |  6 ------
 components/boot.xml              | 13 ++-----------
 config.sh                        | 14 --------------
 config.xml                       |  1 -
 repositories/core-nonrawhide.xml | 13 +++----------
 root/etc/sysconfig/kernel        |  2 +-
 7 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/builder.py b/builder.py
index 87acaa3..86a7031 100755
--- a/builder.py
+++ b/builder.py
@@ -129,9 +129,6 @@ def kiwiBuild(profile):
 
 
 def packageBuild(target):
-    # TODO: rewrite in python instead of shelling out
-    runCommand(["./make-asahi-installer-package.sh"])
-
     base = f"fedora-{RELEASE}-{target['id']}-{BUILDVER}"
     os.rename(f"fedora-{RELEASE}-{BUILDVER}.zip", f"{base}.zip")
     os.rename(f"fedora-{RELEASE}-{BUILDVER}.logs.zip", f"{base}.logs.zip")
diff --git a/components/base.xml b/components/base.xml
index 77da92a..9b205c5 100644
--- a/components/base.xml
+++ b/components/base.xml
@@ -13,11 +13,5 @@
 		<ignore name="dracut-config-rescue"/>
 		<ignore name="generic-release*"/>
 		<ignore name="generic-logos*"/>
-		<!-- Asahi packages -->
-		<package name="alsa-ucm-asahi"/>
-		<package name="asahi-platform-metapackage"/>
-		<package name="asahi-repos"/>
-		<package name="fedora-asahi-remix-scripts"/>
-		<package name="tiny-dfr"/>
 	</packages>
 </image>
diff --git a/components/boot.xml b/components/boot.xml
index 939dad0..23191b3 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -6,18 +6,9 @@
 		<package name="grubby"/>
 	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="BootCore">
-		<package name="grub2-efi-aa64" arch="aarch64"/>
-		<package name="grub2-efi-aa64-modules" arch="aarch64"/>
-		<package name="shim-signed-aa64" arch="aarch64"/>
-		<package name="grub2-efi-aa64" arch="aarch64"/>
-		<package name="uboot-images-armv8" arch="aarch64"/>
-		<package name="kernel-16k"/>
-		<package name="kernel-16k-modules-extra"/>
+		<package name="kernel"/>
+		<package name="kernel-modules-extra"/>
 		<package name="systemd-oomd-defaults"/>
 		<package name="systemd-resolved"/>
-		<!-- Asahi packages -->
-		<package name="asahi-fwextract" arch="aarch64"/>
-		<package name="dracut-asahi" arch="aarch64"/>
-		<package name="update-m1n1" arch="aarch64"/>
 	</packages>
 </image>
diff --git a/config.sh b/config.sh
index 81bf143..ae9c645 100755
--- a/config.sh
+++ b/config.sh
@@ -71,13 +71,6 @@ elif [[ "$kiwi_profiles" != *"GNOME"* ]] && [[ "$kiwi_profiles" != *"KDE"* ]]; t
 	touch /etc/reconfigSys
 fi
 
-## Enable swap setup on firstboot
-systemctl enable asahi-setup-swap-firstboot.service
-
-## Enable extras install on firstboot; this will only run if the extras are
-## actually present (and self disable afterwards)
-systemctl enable asahi-extras-firstboot.service
-
 #======================================
 # Setup default target
 #--------------------------------------
@@ -99,11 +92,4 @@ rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
 
-#======================================
-# Generate boot.bin
-#======================================
-mkdir -p /boot/efi/m1n1
-update-m1n1 /boot/efi/m1n1/boot.bin
-rm /boot/.builder
-
 exit 0
diff --git a/config.xml b/config.xml
index 74ac3e8..e7b6d3a 100644
--- a/config.xml
+++ b/config.xml
@@ -16,7 +16,6 @@
 		<release-version>40</release-version>
 	</preferences>
 	<include from="this://./repositories/core.xml"/>
-	<include from="this://./repositories/asahi.xml"/>
 	<include from="this://./components/boot.xml"/>
 	<include from="this://./components/base.xml"/>
 	<include from="this://./components/desktop-environments.xml"/>
diff --git a/repositories/core-nonrawhide.xml b/repositories/core-nonrawhide.xml
index d6ed79f..9ddd02a 100644
--- a/repositories/core-nonrawhide.xml
+++ b/repositories/core-nonrawhide.xml
@@ -1,12 +1,5 @@
 <image>
-	<repository type="rpm-md" alias="fedora" sourcetype="metalink">
-		<source path="https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch">
-			<signing key="file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary"/>
-		</source>
-	</repository>
-        <repository type="rpm-md" alias="updates" sourcetype="metalink">
-                <source path="https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch">
-                        <signing key="file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary"/>
-                </source>
-        </repository>
+    <repository type="rpm-md" alias="fedora" sourcetype="baseurl">
+        <source path="http://fedora.riscv.rocks/repos-dist/f$releasever/latest/$basearch"></source>
+    </repository>
 </image>
diff --git a/root/etc/sysconfig/kernel b/root/etc/sysconfig/kernel
index 50c22c1..8da1970 100644
--- a/root/etc/sysconfig/kernel
+++ b/root/etc/sysconfig/kernel
@@ -3,4 +3,4 @@
 UPDATEDEFAULT=yes
 
 # DEFAULTKERNEL specifies the default kernel package type
-DEFAULTKERNEL=kernel-16k-core
+DEFAULTKERNEL=kernel-core