From 48f14ec616c963a198e0351d609943368c78abd2 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Aug 07 2024 15:52:50 +0000 Subject: [PATCH 1/7] components/desktop-environments: Exclude Xorg instead of uninstalling it This reduces the number of actions and ensures we catch issues early caused by accidental dependencies on the X11 session stack. --- diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml index 137449c..fa0f272 100644 --- a/components/desktop-environments.xml +++ b/components/desktop-environments.xml @@ -24,9 +24,7 @@ - - - + From a6c740d4d7ecaee35abe2c4a0a1d3319879c8232 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Dec 02 2024 22:58:02 +0000 Subject: [PATCH 2/7] Fix check for empty "${openh264_urls}" Fixes: 402a8ff ("Write empty object if "extras" is empty") --- diff --git a/make-asahi-installer-package.sh b/make-asahi-installer-package.sh index f7ec675..018a14f 100755 --- a/make-asahi-installer-package.sh +++ b/make-asahi-installer-package.sh @@ -93,7 +93,7 @@ if [ "$release" != rawhide -a $release -le 39 ]; then fi openh264_urls=$(rpmdistro-repoquery fedora "$release" ${openh264_rpms} --location) -if [ -e "${openh264_urls}" ]; then +if [ -z "${openh264_urls}" ]; then extras="{}" else extras="$(printf '%s\n' "${openh264_urls}" | newlineToJson)" From 38e1506a0f585fcd1435519b82d49f0d44a76659 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Dec 13 2024 13:58:31 +0000 Subject: [PATCH 3/7] Ignore qemu-user-static (indirect toolbox/podman recommend) "qemu-user-static" install qemu-user-static sub-packages for all supported architectures using several hundred megabyte of disk space. These are not relevant for desktop use and should not end up in the default image. --- diff --git a/components/base.xml b/components/base.xml index 77da92a..786fa9f 100644 --- a/components/base.xml +++ b/components/base.xml @@ -13,6 +13,8 @@ + + From c53d0b1e67ac213bc5521dc6025c918478784594 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Dec 13 2024 19:08:52 +0000 Subject: [PATCH 4/7] Use curl to download the fedora partition logo wget is not available by default in Fedora 41+. --- diff --git a/make-asahi-installer-package.sh b/make-asahi-installer-package.sh index 018a14f..d376c1f 100755 --- a/make-asahi-installer-package.sh +++ b/make-asahi-installer-package.sh @@ -47,7 +47,7 @@ if [ -e "$package" ]; then fail "$package already exists, aborting" fi -requireCommands 7z awk cat cp dd fdisk file mkdir mv stat wget +requireCommands 7z awk cat cp dd fdisk file mkdir mv stat curl workdir="$(mktemp -dp /var/tmp)" trap 'rm -rf "$workdir"' EXIT @@ -79,7 +79,7 @@ root_size="$(stat -c %s "${workdir}/package/root.img")" # boot picker icon if [ ! -f fedora.icns ]; then - wget https://pagure.io/fedora-logos/blob/master/f/bootloader/fedora.icns + curl -LO https://pagure.io/fedora-logos/blob/master/f/bootloader/fedora.icns fi cp -p fedora.icns "${workdir}/package" From d36b704256edc1c89fa5c155802ec9c3f41a5c9a Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Dec 13 2024 21:21:59 +0000 Subject: [PATCH 5/7] Ignore firmware packages without use Devices requiring these firmware files are either completely useless (amd-ucode-firmware, intel-audio-firmware, qcom-firmware) or impossible to use without Thunderbolt/USB4 PCIe support. Even with Tb PCIe support the expected number of users is not large enough to ship this by default. Saves around 200MB of disk space for Fedora 41. --- diff --git a/components/base.xml b/components/base.xml index 786fa9f..958aab9 100644 --- a/components/base.xml +++ b/components/base.xml @@ -15,6 +15,14 @@ + + + + + + + + From a59e0c1efb5e5f0a206d2cc8f9ed193ef6898702 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Dec 14 2024 09:23:55 +0000 Subject: [PATCH 6/7] Merge branch 'rawhide' into f40 --- diff --git a/components/base.xml b/components/base.xml index 77da92a..958aab9 100644 --- a/components/base.xml +++ b/components/base.xml @@ -13,6 +13,16 @@ + + + + + + + + + + diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml index 137449c..fa0f272 100644 --- a/components/desktop-environments.xml +++ b/components/desktop-environments.xml @@ -24,9 +24,7 @@ - - - + diff --git a/make-asahi-installer-package.sh b/make-asahi-installer-package.sh index f7ec675..d376c1f 100755 --- a/make-asahi-installer-package.sh +++ b/make-asahi-installer-package.sh @@ -47,7 +47,7 @@ if [ -e "$package" ]; then fail "$package already exists, aborting" fi -requireCommands 7z awk cat cp dd fdisk file mkdir mv stat wget +requireCommands 7z awk cat cp dd fdisk file mkdir mv stat curl workdir="$(mktemp -dp /var/tmp)" trap 'rm -rf "$workdir"' EXIT @@ -79,7 +79,7 @@ root_size="$(stat -c %s "${workdir}/package/root.img")" # boot picker icon if [ ! -f fedora.icns ]; then - wget https://pagure.io/fedora-logos/blob/master/f/bootloader/fedora.icns + curl -LO https://pagure.io/fedora-logos/blob/master/f/bootloader/fedora.icns fi cp -p fedora.icns "${workdir}/package" @@ -93,7 +93,7 @@ if [ "$release" != rawhide -a $release -le 39 ]; then fi openh264_urls=$(rpmdistro-repoquery fedora "$release" ${openh264_rpms} --location) -if [ -e "${openh264_urls}" ]; then +if [ -z "${openh264_urls}" ]; then extras="{}" else extras="$(printf '%s\n' "${openh264_urls}" | newlineToJson)" From c5fa2db395e1b4d7b37efe46c40ebae117416357 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Dec 14 2024 10:39:51 +0000 Subject: [PATCH 7/7] Revert "components/desktop-environments: Exclude Xorg instead of uninstalling it" This reverts commit 48f14ec616c963a198e0351d609943368c78abd2. --- diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml index fa0f272..137449c 100644 --- a/components/desktop-environments.xml +++ b/components/desktop-environments.xml @@ -24,7 +24,9 @@ - + + +