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-eln.xml16
-rw-r--r--components/boot.xml106
-rw-r--r--components/common.xml13
-rw-r--r--components/desktops/cinnamon.xml4
-rw-r--r--components/desktops/common.xml8
-rw-r--r--components/desktops/cosmic.xml11
-rw-r--r--components/desktops/gnome.xml3
-rw-r--r--components/desktops/i3.xml2
-rw-r--r--components/desktops/kde.xml30
-rw-r--r--components/desktops/lxde.xml1
-rw-r--r--components/desktops/lxqt.xml11
-rw-r--r--components/desktops/mate.xml2
-rw-r--r--components/desktops/miraclewm.xml1
-rw-r--r--components/desktops/phosh.xml4
-rw-r--r--components/desktops/soas.xml4
-rw-r--r--components/desktops/sway.xml1
-rw-r--r--components/desktops/xfce.xml1
-rw-r--r--components/liveinstall-eln.xml65
-rw-r--r--components/liveinstall.xml37
-rw-r--r--components/users.xml2
20 files changed, 127 insertions, 195 deletions
diff --git a/components/boot-eln.xml b/components/boot-eln.xml
index ee380b6..2ec08dd 100644
--- a/components/boot-eln.xml
+++ b/components/boot-eln.xml
@@ -10,10 +10,10 @@
<type image="oem"
filesystem="xfs"
kernelcmdline="rhgb quiet" devicepersistency="by-uuid" target_blocksize="4096"
- bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="500" firmware="uefi"
+ bootpartition="true" bootpartsize="1024" bootfilesystem="xfs" efipartsize="500" firmware="uefi"
rootfs_label="fedora"
>
- <bootloader name="grub2" bls="true" console="console" timeout="1" timeout_style="hidden"/>
+ <bootloader name="grub2" console="console" timeout="1" timeout_style="hidden"/>
<oemconfig>
<oem-resize>false</oem-resize>
</oemconfig>
@@ -23,10 +23,10 @@
<type image="oem"
filesystem="xfs"
kernelcmdline="rhgb quiet" devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" firmware="ofw"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" firmware="ofw"
rootfs_label="fedora"
>
- <bootloader name="grub2" bls="true" console="console" timeout="1" timeout_style="hidden"/>
+ <bootloader name="grub2" console="console" timeout="1" timeout_style="hidden"/>
<oemconfig>
<oem-resize>false</oem-resize>
</oemconfig>
@@ -37,7 +37,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="2000" bootfilesystem="xfs"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="xfs"
rootfs_label="fedora"
>
<bootloader name="zipl" timeout="1"/>
@@ -76,10 +76,4 @@
<package name="grub2-efi-aa64-cdboot" arch="aarch64"/>
<package name="grub2-efi-x64-cdboot" arch="x86_64"/>
</packages>
- <packages type="image" patternType="plusRecommended" profiles="BootDiskCore">
- <package name="glibc-all-langpacks"/>
- <package name="kernel"/>
- <package name="kernel-modules"/>
- <package name="kernel-modules-extra"/>
- </packages>
</image>
diff --git a/components/boot.xml b/components/boot.xml
index 816bb91..e62b2a6 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -2,26 +2,18 @@
<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>
- <!-- 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">
+ <preferences profiles="BootDiskCore" arch="x86_64,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"
- bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
+ kernelcmdline="rhgb quiet" devicepersistency="by-uuid" target_blocksize="4096"
+ bootpartition="true" bootpartsize="1024" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
rootfs_label="fedora"
>
- <bootloader name="grub2" bls="true" console="console" timeout="5"/>
+ <bootloader name="grub2" console="console" timeout="1" timeout_style="hidden"/>
<systemdisk name="fedora">
<volume name="@root=root"/>
<volume name="home" parent="/"/>
@@ -32,51 +24,77 @@
</oemconfig>
</type>
</preferences>
- <packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI,BootCoreLive">
+ <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="1000" bootfilesystem="ext4" firmware="ofw"
+ rootfs_label="fedora"
+ >
+ <bootloader name="grub2" console="console" timeout="1" timeout_style="hidden"/>
+ <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="1000" 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">
<package name="grubby"/>
</packages>
- <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="grub2-efi-aa64" arch="aarch64"/>
+ <package name="grub2-efi-aa64-modules" arch="aarch64"/>
+ <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-x64" arch="x86_64"/>
<package name="kernel-core"/>
+ <package name="systemd-oomd-defaults"/>
+ <package name="systemd-resolved"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="BootCoreUKI">
- <package name="shim-signed-aa64"/>
+ <package name="shim-signed-aa64" arch="aarch64"/>
+ <package name="shim-signed-x64" arch="x86_64"/>
<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,BootCoreLive">
- <package name="grub2-efi-aa64-cdboot"/>
+ <packages type="iso" patternType="plusRecommended" profiles="BootCore">
+ <package name="grub2-efi-aa64-cdboot" arch="aarch64"/>
+ <package name="grub2-efi-x64-cdboot" arch="x86_64"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="BootDiskCore">
- <ignore name="kernel-*debug*"/>
- <package name="glibc-all-langpacks"/>
- <!-- 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="arm-image-installer" arch="aarch64"/>
+ <package name="bcm283x-firmware" arch="aarch64"/>
+ <package name="uboot-images-armv8" arch="aarch64"/>
</packages>
</image>
diff --git a/components/common.xml b/components/common.xml
deleted file mode 100644
index 506cf73..0000000
--- a/components/common.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<image>
- <profiles>
- <profile name="BaseCommon" description="Base common packages"/>
- <profile name="HardwareCommon" description="Base common packages for hardware support"/>
- </profiles>
- <packages type="image" patternType="plusRecommended" profiles="BaseCommon">
- <namedCollection name="standard"/>
- <ignore name="qemu-user-static"/> <!-- Saves ~100MB -->
- </packages>
- <packages type="image" patternType="plusRecommended" profiles="HardwareCommon">
- <namedCollection name="hardware-support"/>
- </packages>
-</image>
diff --git a/components/desktops/cinnamon.xml b/components/desktops/cinnamon.xml
index 3bd5a4e..9317053 100644
--- a/components/desktops/cinnamon.xml
+++ b/components/desktops/cinnamon.xml
@@ -1,5 +1,6 @@
<image>
<profiles>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
<profile name="Cinnamon-Desktop" description="Cinnamon Desktop">
<requires profile="DesktopCommon"/>
</profile>
@@ -8,6 +9,7 @@
<!-- install env-group to resolve RhBug:1891500 -->
<namedCollection name="cinnamon-desktop-environment"/>
<namedCollection name="libreoffice"/>
- <package name="exaile"/>
+ <package name="rhythmbox"/>
+ <package name="f39-backgrounds-extras-gnome"/> <!-- extra backgrounds -->
</packages>
</image>
diff --git a/components/desktops/common.xml b/components/desktops/common.xml
index fed17c4..793c351 100644
--- a/components/desktops/common.xml
+++ b/components/desktops/common.xml
@@ -1,17 +1,15 @@
<image>
<profiles>
- <profile name="DesktopCommon" description="Common desktop packages">
- <requires profile="BaseCommon"/>
- <requires profile="HardwareCommon"/>
- </profile>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
</profiles>
<packages type="image" patternType="plusRecommended" profiles="DesktopCommon">
<namedCollection name="fonts"/>
<namedCollection name="multimedia"/>
<namedCollection name="networkmanager-submodules"/>
+ <namedCollection name="hardware-support"/>
<namedCollection name="printing"/>
<namedCollection name="guest-desktop-agents"/>
- <package name="mediawriter"/>
+ <namedCollection name="standard"/>
<ignore name="gfs2-utils"/>
<ignore name="reiserfs-utils"/>
</packages>
diff --git a/components/desktops/cosmic.xml b/components/desktops/cosmic.xml
deleted file mode 100644
index 4d010a7..0000000
--- a/components/desktops/cosmic.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<image>
- <profiles>
- <profile name="COSMIC-Desktop" description="COSMIC Desktop">
- <requires profile="DesktopCommon"/>
- </profile>
- </profiles>
- <packages type="image" patternType="plusRecommended" profiles="COSMIC-Desktop">
- <!-- install env-group to resolve RhBug:1891500 -->
- <namedCollection name="cosmic-desktop-environment"/>
- </packages>
-</image>
diff --git a/components/desktops/gnome.xml b/components/desktops/gnome.xml
index 17ffc36..e81c540 100644
--- a/components/desktops/gnome.xml
+++ b/components/desktops/gnome.xml
@@ -1,5 +1,6 @@
<image>
<profiles>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
<profile name="GNOME-Desktop" description="GNOME Desktop">
<requires profile="DesktopCommon"/>
</profile>
@@ -7,7 +8,5 @@
<packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop">
<!-- install env-group to resolve RhBug:1891500 -->
<namedCollection name="workstation-product-environment"/>
- <!-- space saving, see https://bugzilla.redhat.com/show_bug.cgi?id=2360056#c45 -->
- <ignore name="python3-boto3"/>
</packages>
</image>
diff --git a/components/desktops/i3.xml b/components/desktops/i3.xml
index 26e73d2..ae2464d 100644
--- a/components/desktops/i3.xml
+++ b/components/desktops/i3.xml
@@ -1,5 +1,6 @@
<image>
<profiles>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
<profile name="i3-Desktop" description="i3 Desktop">
<requires profile="DesktopCommon"/>
</profile>
@@ -7,6 +8,7 @@
<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/kde.xml b/components/desktops/kde.xml
index 4c20ea5..4839b12 100644
--- a/components/desktops/kde.xml
+++ b/components/desktops/kde.xml
@@ -1,5 +1,6 @@
<image>
<profiles>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
<profile name="KDE-Desktop" description="KDE Plasma Desktop">
<requires profile="DesktopCommon"/>
</profile>
@@ -7,45 +8,34 @@
<requires profile="DesktopCommon"/>
</profile>
</profiles>
- <!-- Common exclusions for KDE variants -->
- <packages type="image" patternType="plusRecommended" profiles="KDE-Desktop,KDE-Mobile">
- <ignore name="gnome-disk-utility"/> <!-- redundant with kde partitionmanager -->
- <ignore name="mariadb-server-utils"/> <!-- Not needed on desktops (pagure.io:fedora-kde/SIG#566) -->
- <ignore name="system-config-language"/> <!-- redundant with kcms -->
- <ignore name="system-config-printer"/> <!-- redundant with kcms -->
- <!-- drop tracker stuff pulled in by gtk3 (pagureio:fedora-kde/SIG#124) -->
- <ignore name="tracker"/>
- <ignore name="tracker-miners"/>
- <!-- space issues -->
- <ignore name="digikam"/> <!-- digikam has duplicate functionality with gwenview (~28 megs) -->
- <ignore name="k3b"/> <!-- ~15 megs -->
- <ignore name="kipi-plugins"/> <!-- ~8 megs + drags in marble -->
- <ignore name="krusader"/> <!-- ~4 megs -->
- <ignore name="ktorrent"/> <!-- ~15 megs -->
- <ignore name="initial-setup"/> <!-- redundant with plasma-setup -->
- </packages>
<packages type="image" patternType="plusRecommended" profiles="KDE-Desktop">
<!-- install env-group to resolve RhBug:1891500 -->
<namedCollection name="kde-desktop-environment"/>
<namedCollection name="kde-apps"/>
<namedCollection name="kde-media"/>
- <namedCollection name="kde-pim" arch="aarch64,ppc64le,x86_64"/>
+ <namedCollection name="kde-spin-initial-setup"/>
<namedCollection name="firefox"/>
<namedCollection name="libreoffice"/>
- <namedCollection name="x86-emulation" arch="aarch64"/>
<package name="libreoffice-draw"/>
<package name="libreoffice-math"/>
<package name="fuse"/>
<package name="kde-l10n"/>
+ <ignore name="@admin-tools"/>
+ <ignore name="gnome-disk-utility"/>
+ <ignore name="system-config-printer"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="KDE-Mobile">
<!-- install env-group to resolve RhBug:1891500 -->
<namedCollection name="kde-mobile-environment"/>
+ <!-- not ideal, but the best we can do for now -->
+ <namedCollection name="kde-spin-initial-setup"/>
<namedCollection name="firefox"/>
- <namedCollection name="x86-emulation" arch="aarch64"/>
<package name="fuse"/>
<package name="kde-l10n"/>
+ <ignore name="@admin-tools"/>
<ignore name="plasma-welcome"/>
<ignore name="plasma-welcome-fedora"/>
+ <ignore name="gnome-disk-utility"/>
+ <ignore name="system-config-printer"/>
</packages>
</image>
diff --git a/components/desktops/lxde.xml b/components/desktops/lxde.xml
index b14e097..0dbe83b 100644
--- a/components/desktops/lxde.xml
+++ b/components/desktops/lxde.xml
@@ -1,5 +1,6 @@
<image>
<profiles>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
<profile name="LXDE-Desktop" description="LXDE Desktop">
<requires profile="DesktopCommon"/>
</profile>
diff --git a/components/desktops/lxqt.xml b/components/desktops/lxqt.xml
index af700f2..2b20dd4 100644
--- a/components/desktops/lxqt.xml
+++ b/components/desktops/lxqt.xml
@@ -1,5 +1,6 @@
<image>
<profiles>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
<profile name="LXQt-Desktop" description="LXQt Desktop">
<requires profile="DesktopCommon"/>
</profile>
@@ -10,6 +11,11 @@
<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="enki"/> <!-- 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 -->
@@ -17,13 +23,10 @@
<ignore name="adobe-source-han-sans-cn-fonts"/> <!-- Simplified Chinese: replaced by above -->
<ignore name="adobe-source-han-sans-tw-fonts"/> <!-- Traditional Chinese: replaced by above -->
<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"/>
- -->
- <!-- because the input-methods group exclusion doesn't work, these aren't safe
+ <ignore name="@admin-tools"/>
<ignore name="scim*"/>
<ignore name="m17n*"/>
<ignore name="iok"/>
- -->
</packages>
</image>
diff --git a/components/desktops/mate.xml b/components/desktops/mate.xml
index bcc577d..2239255 100644
--- a/components/desktops/mate.xml
+++ b/components/desktops/mate.xml
@@ -1,5 +1,6 @@
<image>
<profiles>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
<profile name="MATE-Desktop" description="MATE Desktop">
<requires profile="DesktopCommon"/>
</profile>
@@ -12,6 +13,7 @@
<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/desktops/miraclewm.xml b/components/desktops/miraclewm.xml
index f986915..74b51f2 100644
--- a/components/desktops/miraclewm.xml
+++ b/components/desktops/miraclewm.xml
@@ -1,5 +1,6 @@
<image>
<profiles>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
<profile name="MiracleWM-Desktop" description="MiracleWM Desktop">
<requires profile="DesktopCommon"/>
</profile>
diff --git a/components/desktops/phosh.xml b/components/desktops/phosh.xml
index 7362244..cb8466e 100644
--- a/components/desktops/phosh.xml
+++ b/components/desktops/phosh.xml
@@ -1,15 +1,15 @@
<image>
<profiles>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
<profile name="Phosh-Desktop" description="Phosh Desktop">
<requires profile="DesktopCommon"/>
</profile>
</profiles>
<packages type="bootstrap" patternType="plusRecommended" profiles="Phosh-Desktop">
- <package name="fedora-release-mobility"/>
+ <package name="fedora-release-phosh"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="Phosh-Desktop">
<!-- install env-group to resolve RhBug:1891500 -->
<namedCollection name="phosh-desktop-environment"/>
- <package name="initial-setup-gui-wayland-generic"/>
</packages>
</image>
diff --git a/components/desktops/soas.xml b/components/desktops/soas.xml
index f91802a..490172f 100644
--- a/components/desktops/soas.xml
+++ b/components/desktops/soas.xml
@@ -1,5 +1,6 @@
<image>
<profiles>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
<profile name="SoaS-Desktop" description="SoaS Desktop">
<requires profile="DesktopCommon"/>
</profile>
@@ -14,9 +15,8 @@
<package name="sil-abyssinica-fonts"/>
<package name="vlgothic-fonts"/>
<package name="rp-pppoe"/> <!-- See http://bugs.sugarlabs.org/ticket/1951 -->
- <package name="livecd-iso-to-mediums" arch="x86_64"/> <!-- See http://bugs.sugarlabs.org/ticket/74 -->
+ <package name="livecd-tools"/> <!-- See http://bugs.sugarlabs.org/ticket/74 -->
<package name="xfce-polkit"/>
- <package name="initial-setup-gui-wayland-generic"/>
<ignore name="@gnome-desktop"/>
<ignore name="firefox"/>
<ignore name="ibus*"/>
diff --git a/components/desktops/sway.xml b/components/desktops/sway.xml
index e6777f2..dee527a 100644
--- a/components/desktops/sway.xml
+++ b/components/desktops/sway.xml
@@ -1,5 +1,6 @@
<image>
<profiles>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
<profile name="Sway-Desktop" description="Sway Desktop">
<requires profile="DesktopCommon"/>
</profile>
diff --git a/components/desktops/xfce.xml b/components/desktops/xfce.xml
index 141d52e..0812976 100644
--- a/components/desktops/xfce.xml
+++ b/components/desktops/xfce.xml
@@ -1,5 +1,6 @@
<image>
<profiles>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
<profile name="Xfce-Desktop" description="Xfce Desktop">
<requires profile="DesktopCommon"/>
</profile>
diff --git a/components/liveinstall-eln.xml b/components/liveinstall-eln.xml
deleted file mode 100644
index 20f3c40..0000000
--- a/components/liveinstall-eln.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<image>
- <profiles>
- <profile name="LiveInstall" description="Live Install ISO">
- <requires profile="BootCore"/>
- </profile>
- </profiles>
- <preferences profiles="LiveInstall" arch="x86_64">
- <type image="iso"
- publisher="Fedora Project" volid="Fedora_Linux_ELN" application_id="Fedora_Linux_ELN"
- 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_ELN" application_id="Fedora_Linux_ELN"
- 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-arm.cfg.iso-template" console="console" timeout="10"/>
- </type>
- </preferences>
- <preferences profiles="LiveInstall" arch="riscv64">
- <type image="iso"
- publisher="Fedora Project" volid="Fedora_Linux_ELN" application_id="Fedora_Linux_ELN"
- 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_ELN" application_id="Fedora_Linux_ELN"
- 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"/>
- <!-- The point of a live image is to install -->
- <namedCollection name="anaconda-tools"/>
- <package name="anaconda-install-env-deps"/>
- <package name="anaconda-live"/>
- <package name="dracut-live"/>
- <package name="glibc-all-langpacks"/>
- <package name="isomd5sum"/>
- <package name="kernel"/>
- <package name="kernel-modules"/>
- <package name="kernel-modules-extra"/>
- <package name="livesys-scripts"/>
- <ignore name="device-mapper-multipath"/>
- <ignore name="fcoe-utils"/>
- <ignore name="gfs2-utils"/>
- </packages>
-</image>
diff --git a/components/liveinstall.xml b/components/liveinstall.xml
index c04ca7f..c870f87 100644
--- a/components/liveinstall.xml
+++ b/components/liveinstall.xml
@@ -1,26 +1,40 @@
<image>
<profiles>
<profile name="LiveInstall" description="Live Install ISO">
- <requires profile="BaseCommon"/>
- <requires profile="BootCoreLive"/>
+ <requires profile="BootCore"/>
</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" mediacheck="true"
+ firmware="uefi" efifatimagesize="30" kernelcmdline="quiet rhgb"
+ >
+ <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="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"
+ primary="true" flags="dmsquash" mediacheck="true"
+ firmware="uefi" efifatimagesize="30" kernelcmdline="quiet rhgb"
>
<bootloader name="grub2" grub_template="grub-arm.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" mediacheck="true"
+ firmware="ofw" kernelcmdline="quiet rhgb"
+ >
+ <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"/>
<!-- The point of a live image is to install -->
<namedCollection name="anaconda-tools"/>
+ <package name="anaconda"/>
<package name="anaconda-install-env-deps"/>
<package name="anaconda-live"/>
<!-- Need this for SVG release note images -->
@@ -28,17 +42,12 @@
<package name="dracut-live"/>
<package name="glibc-all-langpacks"/>
<package name="isomd5sum"/>
- <!-- 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"/>
<package name="kernel-modules"/>
<package name="kernel-modules-extra"/>
<package name="livesys-scripts"/>
<package name="btrfs-progs"/>
<package name="udisks2-btrfs"/>
- <ignore name="device-mapper-multipath"/>
- <ignore name="fcoe-utils"/>
<ignore name="gfs2-utils"/>
</packages>
</image>
diff --git a/components/users.xml b/components/users.xml
index ab9dcb7..08b91a1 100644
--- a/components/users.xml
+++ b/components/users.xml
@@ -1,5 +1,5 @@
<image>
- <users profiles="BootCore">
+ <users profiles="Cloud-Azure,Cloud-AmazonEC2,Cloud-GCE,Cloud-OpenStack,LiveInstall">
<!-- The password here does not matter, it will be erased in config.sh -->
<user name="root" groups="root" password="linux" home="/root" pwdformat="plain" />
</users>
generated by cgitext v1.3.1+16 (git 2.54.0) at 2026-09-07 17:51:47 +0000