From e06fdcbd90f3d5945fada352aa44eb9975ef072f Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mar 27 2026 19:09:59 +0000 Subject: [PATCH 1/6] Fix container image tag to Fedora 42 in build instructions Fixes: 59250f8 ("Update build instructions to Fedora 42") --- diff --git a/README.md b/README.md index eaaa781..8dcbf64 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ $ sudo podman pull registry.fedoraproject.org/fedora:42-aarch64 Assuming you're in the root directory of the Git checkout, set up the container: ```bash -$ sudo podman run --privileged --rm -it -v $PWD:/code:z -w /code registry.fedoraproject.org/fedora:21-aarch64 /bin/bash +$ sudo podman run --privileged --rm -it -v $PWD:/code:z -w /code registry.fedoraproject.org/fedora:42-aarch64 /bin/bash ``` Once in the container environment, set up your development environment and run the image build (substitute `` and `` for the appropriate settings): From 43eefc46b5484817068f5d5473365118583d9a42 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mar 27 2026 19:12:48 +0000 Subject: [PATCH 2/6] Do not set `allow_vendor_change=False` in /etc/dnf/dnf.conf Since Fedora 43 asahi-repos carries a dnf5 drop in config with the same setting. This has the the advantage that it can be removed via a package update. --- diff --git a/config.sh b/config.sh index e2bc6f3..7d8abff 100755 --- a/config.sh +++ b/config.sh @@ -14,11 +14,6 @@ test -f /.profile && . /.profile echo "Configure image: [$kiwi_iname]-[$kiwi_profiles]..." #====================================== -# Turn on sticky vendors -#-------------------------------------- -echo "allow_vendor_change=False" >> /etc/dnf/dnf.conf - -#====================================== # Set SELinux booleans #-------------------------------------- ## Fixes KDE Plasma, see rhbz#2058657 From 001ce7e156df81b0df61348c56ef2fac0c2b4a3b Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mar 27 2026 21:10:44 +0000 Subject: [PATCH 3/6] Adapt Fedora 44 intial setup architecture Fedora KDE Plasma Desktop 44 uses the new plasma-setup as initial setup application. It is functionality wise very close to the Asahi Linux specific calamares-firstboot-config so switch the KDE image to plasma-setup. The GNOME Workstation image uses gnome-initial-setup so only the minimal and server images remain using initial-setup. --- diff --git a/components/base.xml b/components/base.xml index 958aab9..b54be0b 100644 --- a/components/base.xml +++ b/components/base.xml @@ -8,7 +8,6 @@ - diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml index e99bc86..f2f629a 100644 --- a/components/desktop-environments.xml +++ b/components/desktop-environments.xml @@ -45,8 +45,8 @@ - + diff --git a/config.sh b/config.sh index 7d8abff..f8d9a32 100755 --- a/config.sh +++ b/config.sh @@ -62,10 +62,7 @@ mkdir -p /var/log/journal # Setup firstboot initial setup #-------------------------------------- -if [[ "$kiwi_profiles" == *"KDE"* ]]; then - ## Enable calamares - systemctl enable calamares-firstboot.service -elif [[ "$kiwi_profiles" != *"GNOME"* ]] && [[ "$kiwi_profiles" != *"KDE"* ]]; then +if [[ "$kiwi_profiles" != *"GNOME"* ]] && [[ "$kiwi_profiles" != *"KDE"* ]]; then ## Enable initial-setup systemctl enable initial-setup.service ## Enable reconfig mode diff --git a/platforms/minimal.xml b/platforms/minimal.xml index a651895..0d80ba7 100644 --- a/platforms/minimal.xml +++ b/platforms/minimal.xml @@ -19,5 +19,6 @@ + diff --git a/platforms/server.xml b/platforms/server.xml index 1764112..8a0a55d 100644 --- a/platforms/server.xml +++ b/platforms/server.xml @@ -24,5 +24,6 @@ + From f3bbb6de92d5c0233627ea6c5c989200f3aff6bd Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mar 27 2026 21:21:08 +0000 Subject: [PATCH 4/6] Revert "Ignore OpenCL-ICD-Loader to unblock mesa-libOpenCL" This reverts commit 46935576b10eb15adca8cb82cf2bdd7ce0873824. This should be resolved in Fedora. --- diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml index f2f629a..299a9d9 100644 --- a/components/desktop-environments.xml +++ b/components/desktop-environments.xml @@ -26,8 +26,6 @@ - - From c92b0352ffc8c9a81cd6340129aa697ec638d8d8 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mar 27 2026 21:21:08 +0000 Subject: [PATCH 5/6] config.sh: Fix typo and use correct vars for setting up GRUB Hidden Menu The conditional was getting skipped due to a missing whitespace and the editenv command was never getting run. Additionally, we should be using the boot_indeterminate flag for first boot instead of boot_success. (cherry picked from commit 47685b1a647b9d6b60591c61f16b8f80b5ab96ef in https://pagure.io/fedora-kiwi-descriptions) Only the `boot_indeterminate=1` applies to the Fedora Asahi Remix kiwi-description. --- diff --git a/config.sh b/config.sh index f8d9a32..0707e71 100755 --- a/config.sh +++ b/config.sh @@ -42,7 +42,7 @@ echo "GRUB_DISABLE_OS_PROBER=true" >> /etc/default/grub if [[ "$kiwi_profiles" == *"-Desktop"* ]]; then ## Enable menu_auto_hide to match Fedora anaconda installs ## Set boot_success to avoid displaying the grub menu on first boot - grub2-editenv /boot/grub2/grubenv set menu_auto_hide=1 boot_success=1 + grub2-editenv /boot/grub2/grubenv set menu_auto_hide=1 boot_indeterminate=1 fi #====================================== From 8a9a9e922fd039cbc4cb0f1011b9f29c0845dafd Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mar 27 2026 21:21:08 +0000 Subject: [PATCH 6/6] Override DEFAULTKERNEL in /etc/sysconfig/kernel As of grubby-8.40-86 grubby owns the file. Override DEFAULTKERNEL explicitly to kernel-16k-core in config.sh ionstead of relying on the template file in root/etc/sysconfig/kernel. Link: https://src.fedoraproject.org/rpms/grubby/c/482a2825c47c4fd28a18beb279a3e826461bf878 --- diff --git a/config.sh b/config.sh index 0707e71..64133b0 100755 --- a/config.sh +++ b/config.sh @@ -98,6 +98,12 @@ rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn rm -f /var/lib/rpm/__db* #====================================== +# Override `DEFAULTKERNEL` in /etc/sysconfig/kernel +# The file is now owned by grubby +#====================================== +sed -i 's:\(DEFAULTKERNEL=\)kernel-core:\1kernel-16k-core:' /etc/sysconfig/kernel + +#====================================== # Generate boot.bin #====================================== update-m1n1 /boot/efi/m1n1/boot.bin diff --git a/root/etc/sysconfig/kernel b/root/etc/sysconfig/kernel deleted file mode 100644 index 50c22c1..0000000 --- a/root/etc/sysconfig/kernel +++ /dev/null @@ -1,6 +0,0 @@ -# UPDATEDEFAULT specifies if kernel-install should make -# new kernels the default -UPDATEDEFAULT=yes - -# DEFAULTKERNEL specifies the default kernel package type -DEFAULTKERNEL=kernel-16k-core