remove asahi-specific stuff

This commit is contained in:
Pratham Patel 2024-04-30 10:31:37 +05:30
parent 55c7fc5760
commit 6bedd927b0
No known key found for this signature in database
7 changed files with 6 additions and 46 deletions

View File

@ -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")

View File

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

View File

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

View File

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

View File

@ -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"/>

View File

@ -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 type="rpm-md" alias="fedora" sourcetype="baseurl">
<source path="http://fedora.riscv.rocks/repos-dist/f$releasever/latest/$basearch"></source>
</repository>
</image>

View File

@ -3,4 +3,4 @@
UPDATEDEFAULT=yes
# DEFAULTKERNEL specifies the default kernel package type
DEFAULTKERNEL=kernel-16k-core
DEFAULTKERNEL=kernel-core