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 @@
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
-
+
+
-
-
-
-
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 @@
40
-
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 @@
-
-
-
-
-
-
+
+
+
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