aboutsummaryrefslogtreecommitdiff
path: root/components
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/boot.xml122
-rw-r--r--components/common.xml1
-rw-r--r--components/desktops/i3.xml1
-rw-r--r--components/desktops/lxqt.xml6
-rw-r--r--components/desktops/mate.xml1
-rw-r--r--components/liveinstall.xml40
6 files changed, 41 insertions, 130 deletions
diff --git a/components/boot.xml b/components/boot.xml
index 59bd862..816bb91 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -2,13 +2,19 @@
<profiles>
<profile name="BootCore" description="Boot core packages"/>
<profile name="BootCoreUKI" description="Boot core packages for UKI"/>
+ <profile name="BootCoreLive" description="Boot core packages for Live DVDs"/>
<profile name="BootDiskCore" description="Boot disk core configuration">
<requires profile="BaseCommon"/>
<requires profile="HardwareCommon"/>
<requires profile="BootCore"/>
</profile>
</profiles>
- <preferences profiles="BootDiskCore" arch="x86_64,riscv64">
+ <!-- Surface Pro 12" (Snapdragon X1P-42-100) is a standard UEFI/GPT aarch64
+ device, no force_mbr/disk_start_sector/editbootinstall RPi-legacy
+ quirks needed, those are for boards whose own firmware boot stage
+ requires an MBR + specific boot sector offset before handing off to
+ grub. -->
+ <preferences profiles="BootDiskCore" arch="aarch64">
<type image="oem"
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="x-systemd.growfs,compress=zstd:1"
kernelcmdline="rhgb quiet" devicepersistency="by-uuid"
@@ -26,111 +32,51 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="BootDiskCore" arch="aarch64">
- <type image="oem"
- filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="x-systemd.growfs,compress=zstd:1"
- kernelcmdline="rhgb quiet" devicepersistency="by-uuid" force_mbr="true" editbootinstall="editbootinstall_rpilegacy.sh"
- bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="500" disk_start_sector="34816" firmware="uefi"
- rootfs_label="fedora"
- >
- <bootloader name="grub2" bls="true" console="console" timeout="5"/>
- <systemdisk name="fedora">
- <volume name="@root=root"/>
- <volume name="home" parent="/"/>
- <volume name="var" parent="/"/>
- </systemdisk>
- <oemconfig>
- <oem-resize>false</oem-resize>
- </oemconfig>
- </type>
- </preferences>
- <preferences profiles="BootDiskCore" arch="ppc64le">
- <type image="oem"
- filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="x-systemd.growfs,compress=zstd:1"
- kernelcmdline="rhgb quiet" devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" firmware="ofw"
- rootfs_label="fedora"
- >
- <bootloader name="grub2" bls="true" console="console" timeout="5"/>
- <systemdisk>
- <volume name="@root=root"/>
- <volume name="home" parent="/"/>
- <volume name="var" parent="/"/>
- </systemdisk>
- <oemconfig>
- <oem-resize>false</oem-resize>
- </oemconfig>
- </type>
- </preferences>
- <preferences profiles="BootDiskCore" arch="s390x">
- <type image="oem"
- filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="x-systemd.growfs,compress=zstd:1"
- kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
- devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="2000" bootfilesystem="ext4"
- rootfs_label="fedora"
- >
- <bootloader name="zipl" timeout="1"/>
- <systemdisk>
- <volume name="@root=root"/>
- <volume name="home" parent="/"/>
- <volume name="var" parent="/"/>
- </systemdisk>
- <oemconfig>
- <oem-resize>false</oem-resize>
- </oemconfig>
- </type>
- </preferences>
- <packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI">
+ <packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI,BootCoreLive">
<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="grub2-efi-riscv64" arch="riscv64"/>
- <package name="grub2-efi-riscv64-modules" arch="riscv64"/>
- <package name="grub2-efi-ia32" arch="x86_64"/>
- <package name="grub2-efi-ia32-modules" arch="x86_64"/>
- <package name="grub2-efi-x64" arch="x86_64"/>
- <package name="grub2-efi-x64-modules" arch="x86_64"/>
- <package name="grub2-pc" arch="x86_64"/>
- <package name="grub2-pc-modules" arch="x86_64"/>
- <package name="grub2-ppc64le" arch="ppc64le"/>
- <package name="s390utils-base" arch="s390x"/>
- <package name="shim-signed-aa64" arch="aarch64"/>
- <package name="shim-signed-ia32" arch="x86_64"/>
- <package name="shim-signed-x64" arch="x86_64"/>
- <package name="shim-unsigned-riscv64" arch="riscv64"/>
- <package name="kernel-core"/>
+ <packages type="image" patternType="plusRecommended" profiles="BootCore,BootCoreLive">
+ <package name="grub2-efi-aa64"/>
+ <package name="grub2-efi-aa64-modules"/>
+ <package name="shim-signed-aa64"/>
<package name="systemd-oomd-defaults"/>
<package name="systemd-resolved"/>
</packages>
+ <packages type="image" patternType="plusRecommended" profiles="BootCore">
+ <ignore name="kernel-*debug*"/>
+ <package name="kernel-core"/>
+ </packages>
+ <packages type="image" patternType="plusRecommended" profiles="BootCoreLive">
+ <ignore name="kernel-*debug*"/>
+ <!-- Surface Pro 12": kernel-uki-dtbloader bakes in ~3000 boards' dtbs
+ (.dtbauto sections) and hard-conflicts with kernel-core. This board
+ isn't in its dtb database anyway (dtb delivered separately via
+ grub's devicetree directive), so plain kernel-core is enough. -->
+ <package name="kernel-core"/>
+ </packages>
<packages type="image" patternType="plusRecommended" profiles="BootCoreUKI">
- <package name="shim-signed-aa64" arch="aarch64"/>
- <package name="shim-signed-ia32" arch="x86_64"/>
- <package name="shim-signed-x64" arch="x86_64"/>
- <package name="shim-unsigned-riscv64" arch="riscv64"/>
+ <package name="shim-signed-aa64"/>
<package name="systemd-oomd-defaults"/>
<package name="systemd-resolved"/>
<package name="kernel-uki-virt"/>
<package name="python3-virt-firmware"/>
<package name="uki-direct"/>
</packages>
- <packages type="iso" patternType="plusRecommended" profiles="BootCore">
- <package name="grub2-efi-aa64-cdboot" arch="aarch64"/>
- <package name="grub2-efi-riscv64-cdboot" arch="riscv64"/>
- <package name="grub2-efi-ia32-cdboot" arch="x86_64"/>
- <package name="grub2-efi-x64-cdboot" arch="x86_64"/>
+ <packages type="iso" patternType="plusRecommended" profiles="BootCore,BootCoreLive">
+ <package name="grub2-efi-aa64-cdboot"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="BootDiskCore">
- <package name="arm-image-installer" arch="aarch64"/>
+ <ignore name="kernel-*debug*"/>
<package name="glibc-all-langpacks"/>
- <package name="kernel"/>
+ <!-- Surface Pro 12": kernel-core, not kernel-uki-dtbloader's multi-board
+ dtb bloat, same reasoning as BootCoreLive above. arm-image-installer
+ and uboot-images-armv8 dropped too, they exist for flashing/booting
+ other ARM SBCs (device-tree selection, U-Boot), not relevant to this
+ single UEFI/GPT device. -->
+ <package name="kernel-core"/>
<package name="kernel-modules"/>
<package name="kernel-modules-extra"/>
<package name="btrfs-progs"/>
<package name="udisks2-btrfs"/>
- <package name="uboot-images-armv8" arch="aarch64"/>
- <package name="uboot-images-riscv64" arch="riscv64"/>
</packages>
</image>
diff --git a/components/common.xml b/components/common.xml
index dc1f34c..506cf73 100644
--- a/components/common.xml
+++ b/components/common.xml
@@ -9,6 +9,5 @@
</packages>
<packages type="image" patternType="plusRecommended" profiles="HardwareCommon">
<namedCollection name="hardware-support"/>
- <package name="bcm283x-firmware" arch="aarch64"/>
</packages>
</image>
diff --git a/components/desktops/i3.xml b/components/desktops/i3.xml
index c4c0e70..26e73d2 100644
--- a/components/desktops/i3.xml
+++ b/components/desktops/i3.xml
@@ -7,7 +7,6 @@
<packages type="image" patternType="plusRecommended" profiles="i3-Desktop">
<!-- install env-group to resolve RhBug:1891500 -->
<namedCollection name="i3-desktop-environment"/>
- <namedCollection name="admin-tools"/>
<package name="dex-autostart"/>
<package name="fedora-release-i3"/>
<package name="feh"/>
diff --git a/components/desktops/lxqt.xml b/components/desktops/lxqt.xml
index ae7d33f..af700f2 100644
--- a/components/desktops/lxqt.xml
+++ b/components/desktops/lxqt.xml
@@ -10,11 +10,6 @@
<namedCollection name="lxqt-apps"/>
<namedCollection name="lxqt-media"/>
<namedCollection name="lxqt-l10n"/>
- <package name="lximage-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group -->
- <package name="obconf-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group -->
- <package name="pavucontrol-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group -->
- <package name="featherpad"/> <!-- FIXME: put in comps -->
- <package name="udisks2"/> <!-- Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132 -->
<!-- remove unneeded stuff for a lightweight system -->
<package name="wqy-microhei-fonts"/> <!-- compact CJK font -->
<ignore name="naver-nanum-gothic-fonts"/> <!-- Korean: replaced by above -->
@@ -24,7 +19,6 @@
<ignore name="pt-sans-fonts"/> <!-- Cyrillic (already supported by DejaVu) -->
<!-- these do not currently work: https://pagure.io/fedora-kiwi-descriptions/issue/112
<ignore name="@input-methods"/>
- <ignore name="@admin-tools"/>
-->
<!-- because the input-methods group exclusion doesn't work, these aren't safe
<ignore name="scim*"/>
diff --git a/components/desktops/mate.xml b/components/desktops/mate.xml
index db193c6..bcc577d 100644
--- a/components/desktops/mate.xml
+++ b/components/desktops/mate.xml
@@ -12,7 +12,6 @@
<ignore name="audacious"/> <!-- breaks the desktop -->
<!-- drop things for size -->
<ignore name="@3d-printing"/>
- <ignore name="@admin-tools"/>
<ignore name="@mate-applications"/>
<ignore name="brasero"/>
<ignore name="fedora-icon-theme"/>
diff --git a/components/liveinstall.xml b/components/liveinstall.xml
index 4ba9bfd..c04ca7f 100644
--- a/components/liveinstall.xml
+++ b/components/liveinstall.xml
@@ -2,49 +2,20 @@
<profiles>
<profile name="LiveInstall" description="Live Install ISO">
<requires profile="BaseCommon"/>
- <requires profile="BootCore"/>
+ <requires profile="BootCoreLive"/>
</profile>
</profiles>
- <preferences profiles="LiveInstall" arch="x86_64">
- <type image="iso"
- publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
- primary="true" flags="dmsquash" filesystem="erofs" erofscompression="lzma,level=6" mediacheck="true"
- firmware="uefi" efiparttable="gpt" efifatimagesize="30" kernelcmdline="quiet rhgb"
- fscreateoptions="-Efragments -C 1048576"
- >
- <bootloader name="grub2" grub_template="grub-x86.cfg.iso-template" console="console" timeout="10"/>
- </type>
- </preferences>
<preferences profiles="LiveInstall" arch="aarch64">
<type image="iso"
publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
primary="true" flags="dmsquash" filesystem="erofs" erofscompression="lzma,level=6" mediacheck="true"
- firmware="uefi" efiparttable="gpt" efifatimagesize="30" kernelcmdline="quiet rhgb"
+ firmware="efi" efiparttable="gpt" efifatimagesize="30"
+ kernelcmdline="quiet rhgb mem_sleep_default=s2idle clk_ignore_unused pd_ignore_unused systemd.tpm2_wait=0 rd.live.ram=1"
fscreateoptions="-Efragments -C 1048576"
>
<bootloader name="grub2" grub_template="grub-arm.cfg.iso-template" console="console" timeout="10"/>
</type>
</preferences>
- <preferences profiles="LiveInstall" arch="riscv64">
- <type image="iso"
- publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
- primary="true" flags="dmsquash" filesystem="erofs" erofscompression="lzma,level=6" mediacheck="true"
- firmware="uefi" efiparttable="gpt" efifatimagesize="30" kernelcmdline="quiet rhgb"
- fscreateoptions="-Efragments -C 1048576"
- >
- <bootloader name="grub2" grub_template="grub-riscv64.cfg.iso-template" console="console" timeout="10"/>
- </type>
- </preferences>
- <preferences profiles="LiveInstall" arch="ppc64le">
- <type image="iso"
- publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
- primary="true" flags="dmsquash" filesystem="erofs" erofscompression="lzma,level=6" mediacheck="true"
- firmware="ofw" kernelcmdline="quiet rhgb"
- fscreateoptions="-Efragments -C 1048576"
- >
- <bootloader name="grub2" grub_template="grub-ppc.cfg.iso-template" console="console" timeout="10"/>
- </type>
- </preferences>
<packages type="iso" patternType="plusRecommended" profiles="LiveInstall">
<!-- Filter out unwanted EFI files from the embedded ESP, see rhbz#2358785 -->
<file name="iso-esp-excludes.yaml" target="image/exclude_files_efifatimage.yaml"/>
@@ -57,7 +28,10 @@
<package name="dracut-live"/>
<package name="glibc-all-langpacks"/>
<package name="isomd5sum"/>
- <package name="kernel"/>
+ <!-- Surface Pro 12": no plain "kernel" package here, it hard-Requires
+ kernel-uki-dtbloader on aarch64, which conflicts with BootCoreLive's
+ kernel-core. grub2's ISO kernel lookup just needs a vmlinuz in /boot,
+ which kernel-core (already installed there) already provides. -->
<package name="kernel-modules"/>
<package name="kernel-modules-extra"/>
<package name="livesys-scripts"/>
generated by cgitext v1.3.1+16 (git 2.54.0) at 2026-09-07 20:04:53 +0000