From 84bcc7a40ba873b39d3fb22df242048d59c09cf5 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 07 2025 14:17:34 +0000 Subject: [PATCH 1/6] common: Add selected packages from anaconda-tools comps group Import packages from this group currently missing in Atomic Desktops. In the future, we may rely on the comps group once we have cleaned it up. Drop bcache-tools from kinoite-common. It is no longer (not sure if it ever was) part of the anaconda-tools group. See: https://gitlab.com/fedora/ostree/sig/-/issues/5 --- diff --git a/common.yaml b/common.yaml index 2793a11..cea8e1e 100644 --- a/common.yaml +++ b/common.yaml @@ -52,7 +52,6 @@ packages: - git-core # Explicitely add Git docs - git-core-doc - - lvm2 # Required for compatibility with old bootloaders until we have bootupd # See https://github.com/fedora-silverblue/issue-tracker/issues/120 - ostree-grub2 @@ -76,9 +75,6 @@ packages: # Flatpak support - flatpak - xdg-desktop-portal - # HFS filesystem tools for Apple hardware - # See https://github.com/projectatomic/rpm-ostree/issues/1380 - - hfsplus-tools # Contains default ostree remote config to be used on client's # system for fetching ostree update - fedora-repos-ostree @@ -92,6 +88,14 @@ packages: # See: https://gitlab.com/fedora/ostree/sig/-/issues/50 - fuse - fuse-libs + # Selected packages from the anaconda-tools group. See: https://gitlab.com/fedora/ostree/sig/-/issues/5 + - dosfstools + - lvm2 + - nvme-cli + - xfsprogs + # HFS filesystem tools for Apple hardware + # See https://github.com/projectatomic/rpm-ostree/issues/1380 + - hfsplus-tools selinux: true documentation: true diff --git a/kinoite-common.yaml b/kinoite-common.yaml index 4c537e8..01b7665 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -26,7 +26,6 @@ packages: - kamera # Make sure that previous Anaconda dependencies are kept in the image # See: https://pagure.io/fedora-kde/SIG/issue/243 - - bcache-tools - mobile-broadband-provider-info # Make sure that modem support is installed - NetworkManager-ppp From fdf64cfbea902099f4c9ab4d0ce27a0b367150e5 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 07 2025 14:17:34 +0000 Subject: [PATCH 2/6] common: Exclude Perl by default Explicitely exclude Perl to avoid inclusion in the image via optional dependencies. We can now do that as all the indirect dependencies have been fixed. In general, we want to keep the base image as small as possible and with as few interpreters as possible. Users should install any addition interpreters that they may need inside a container or via package layering. See: https://pagure.io/fedora-kde/SIG/issue/566 See: https://github.com/fedora-silverblue/issue-tracker/issues/613 --- diff --git a/common.yaml b/common.yaml index cea8e1e..54f77b4 100644 --- a/common.yaml +++ b/common.yaml @@ -151,6 +151,9 @@ exclude-packages: - qemu-kvm-core - qemu-device-display-virtio-gpu - qemu-device-display-virtio-vga + # Ensure that we do not include any Perl package + - perl-interpreter + - perl-libs postprocess: - | From 651f01ca7bf454b8d3dcf43fb73a8b9e89730c27 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 07 2025 14:17:34 +0000 Subject: [PATCH 3/6] Drop support for PPC64LE architecture See: https://gitlab.com/fedora/ostree/sig/-/issues/60 --- diff --git a/common-packages.yaml b/common-packages.yaml index 45454b2..00329cf 100644 --- a/common-packages.yaml +++ b/common-packages.yaml @@ -81,6 +81,7 @@ packages: - hostname - hplip - hunspell + - hyperv-daemons - ibus-anthy - ibus-chewing - ibus-gtk3 @@ -120,6 +121,7 @@ packages: - ntfsprogs - nvidia-gpu-firmware - nxpwireless-firmware + - open-vm-tools-desktop - opensc - openssh-clients - openssh-server @@ -192,21 +194,14 @@ packages-x86_64: - alsa-sof-firmware - amd-ucode-firmware - cirrus-audio-firmware - - hyperv-daemons - intel-audio-firmware - intel-vsc-firmware - libva-intel-media-driver - mcelog - microcode_ctl - - open-vm-tools-desktop - thermald - virtualbox-guest-additions packages-aarch64: - - hyperv-daemons - - open-vm-tools-desktop - qcom-firmware - qrtr - rmtfs -packages-ppc64le: - - lsvpd - - powerpc-utils diff --git a/common.yaml b/common.yaml index 54f77b4..6f44833 100644 --- a/common.yaml +++ b/common.yaml @@ -18,18 +18,11 @@ include: # Enable kernel-install support - kernel-install.yaml -# systemd-pcrphase module fails on ppc64le: -# https://gitlab.com/fedora/ostree/sig/-/issues/44 arch-include: x86_64: - - initramfs-tpm-luks.yaml - qemu-user-static-x86_64.yaml aarch64: - - initramfs-tpm-luks.yaml - qemu-user-static-non-x86_64.yaml - ppc64le: - - qemu-user-static-non-x86_64.yaml - conditional-include: # Manifests included only for classic ostree variants @@ -121,8 +114,6 @@ packages-aarch64: - grub2-efi - efibootmgr - shim -packages-ppc64le: - - grub2 packages-x86_64: - grub2-efi-ia32 - grub2-efi-x64 diff --git a/comps-sync.py b/comps-sync.py index 81f0e9b..1445732 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -17,7 +17,7 @@ import sys import yaml import libcomps -ARCHES = ("x86_64", "aarch64", "ppc64le") +ARCHES = ("x86_64", "aarch64") def fatal(msg): '''Print the error message and exit.''' diff --git a/deepin-atomic-packages.yaml b/deepin-atomic-packages.yaml index cb157c6..8effca7 100644 --- a/deepin-atomic-packages.yaml +++ b/deepin-atomic-packages.yaml @@ -1,5 +1,6 @@ # DO NOT EDIT! This content is generated from comps-sync.py packages: + - chromium - deepin-calculator - deepin-calendar - deepin-desktop @@ -26,9 +27,6 @@ packages: - xorg-x11-xauth - xorg-x11-xinit packages-x86_64: - - chromium - xorg-x11-drv-intel - xorg-x11-drv-openchrome - xorg-x11-drv-vmware -packages-aarch64: - - chromium diff --git a/initramfs-tpm-luks.yaml b/initramfs-tpm-luks.yaml deleted file mode 100644 index 8039854..0000000 --- a/initramfs-tpm-luks.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Set dracut configuration for the initramfs -# See: https://gitlab.com/fedora/bootc/base-images/-/blob/main/tier-0/initramfs.yaml -# See: https://github.com/coreos/fedora-coreos-config/tree/testing-devel/overlay.d/05core/usr/lib/dracut/dracut.conf.d -postprocess: - - | - #!/usr/bin/env bash - set -xeuo pipefail - - install -dm 0755 -o 0 -g 0 /usr/lib/dracut/dracut.conf.d - - - | - #!/usr/bin/env bash - set -xeuo pipefail - - cat > /usr/lib/dracut/dracut.conf.d/20-atomic-tpm-luks.conf << 'EOF' - # Add support for systemd-cryptsetup and tpm2-tss LUKS locking - add_dracutmodules+=" tpm2-tss systemd-pcrphase " - EOF diff --git a/initramfs.yaml b/initramfs.yaml index 2aff840..a1c7972 100644 --- a/initramfs.yaml +++ b/initramfs.yaml @@ -26,3 +26,12 @@ postprocess: # save much space. So let's disable it to avoid the error-looking message. do_strip=no EOF + + - | + #!/usr/bin/env bash + set -xeuo pipefail + + cat > /usr/lib/dracut/dracut.conf.d/20-atomic-tpm-luks.conf << 'EOF' + # Add support for systemd-cryptsetup and tpm2-tss LUKS locking + add_dracutmodules+=" tpm2-tss systemd-pcrphase " + EOF diff --git a/kinoite-mobile-packages.yaml b/kinoite-mobile-packages.yaml index cd7b3ab..60b37ef 100644 --- a/kinoite-mobile-packages.yaml +++ b/kinoite-mobile-packages.yaml @@ -1,5 +1,7 @@ # DO NOT EDIT! This content is generated from comps-sync.py packages: + - angelfish + - arianna - bluedevil - elisa-player - haruna @@ -27,11 +29,4 @@ packages: - sddm-themes - sddm-wayland-plasma - spacebar -packages-x86_64: - - angelfish - - arianna - - tokodon -packages-aarch64: - - angelfish - - arianna - tokodon diff --git a/kinoite-packages.yaml b/kinoite-packages.yaml index c2dcc98..feb790d 100644 --- a/kinoite-packages.yaml +++ b/kinoite-packages.yaml @@ -16,6 +16,7 @@ packages: - flatpak-kcm - fprintd-pam - kaccounts-integration-qt6 + - kaccounts-providers - kcharselect - kde-connect - kde-gtk-config @@ -30,8 +31,10 @@ packages: - kdnssd - kf6-baloo-file - kfind + - khelpcenter - kinfocenter - kio-admin + - kio-gdrive - kjournald - kmenuedit - konsole @@ -56,6 +59,7 @@ packages: - plasma-disks - plasma-drkonqi - plasma-nm + - plasma-nm-openconnect - plasma-nm-openvpn - plasma-nm-vpnc - plasma-pa @@ -80,13 +84,3 @@ packages: - udisks2 - vlc-plugin-gstreamer - xwaylandvideobridge -packages-x86_64: - - kaccounts-providers - - khelpcenter - - kio-gdrive - - plasma-nm-openconnect -packages-aarch64: - - kaccounts-providers - - khelpcenter - - kio-gdrive - - plasma-nm-openconnect diff --git a/lxqt-atomic-packages.yaml b/lxqt-atomic-packages.yaml index d95c35c..6870c54 100644 --- a/lxqt-atomic-packages.yaml +++ b/lxqt-atomic-packages.yaml @@ -3,6 +3,7 @@ packages: - breeze-cursor-theme - breeze-gtk - breeze-icon-theme + - falkon - firewall-config - initial-setup-gui - lxqt-about @@ -34,7 +35,3 @@ packages: - sddm-themes - upower - xdg-user-dirs -packages-x86_64: - - falkon -packages-aarch64: - - falkon diff --git a/qemu-user-static-non-x86_64.yaml b/qemu-user-static-non-x86_64.yaml index 7edfafa..4147f68 100644 --- a/qemu-user-static-non-x86_64.yaml +++ b/qemu-user-static-non-x86_64.yaml @@ -1,4 +1,4 @@ -# Keep only x86_64 emulation for aarch64 & ppc64le +# Keep only x86_64 emulation for aarch64 # See: https://gitlab.com/fedora/ostree/sig/-/issues/59 packages: - qemu-user-static-x86 From 0b44811aca2422792cce927069a4242c383024c1 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 07 2025 14:17:34 +0000 Subject: [PATCH 4/6] common: Add more printer drivers by default See: https://gitlab.com/fedora/ostree/sig/-/issues/63 --- diff --git a/common.yaml b/common.yaml index 6f44833..e8da269 100644 --- a/common.yaml +++ b/common.yaml @@ -89,6 +89,12 @@ packages: # HFS filesystem tools for Apple hardware # See https://github.com/projectatomic/rpm-ostree/issues/1380 - hfsplus-tools + # More printer drivers. See: https://gitlab.com/fedora/ostree/sig/-/issues/63 + - c2esp + - dymo-cups-drivers + - printer-driver-brlaser + - ptouch-driver + - splix selinux: true documentation: true From d14a5b03e388f3e5dcbd5da8c7832cde2d7fdcaa Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 07 2025 14:17:34 +0000 Subject: [PATCH 5/6] kinoite-common: Set update frequency to weekly for auto updates We had previously enabled auto updates in Discover but we did not set an update frequency. Kinoite is built daily but it is not necessary for users to update that often. Set the update frequency to weekly to keep a reasonable amount of time between updates while making sure that they happen eventually. Users may also manually update at anytime if they want updates to happen faster or change the default in the system settings. Flatpaks could (and maybe should) be updated faster (daily or every two days) but we need support for that in Discover [1]. [1] https://bugs.kde.org/show_bug.cgi?id=454422 See: https://fedoraproject.org/wiki/Changes/KDEKinoiteAutoUpdateByDefault --- diff --git a/kinoite-common.yaml b/kinoite-common.yaml index 01b7665..c54a299 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -58,5 +58,10 @@ postprocess: #!/bin/bash set -xeuo pipefail - # Enable auto updates in Discover - echo -e "[Global]\nUseUnattendedUpdates=true\n" > /etc/xdg/PlasmaDiscoverUpdates + # Enable weekly auto updates in Discover. In the future, Flatpaks will be + # updated daily. See: https://bugs.kde.org/show_bug.cgi?id=454422 + cat > /etc/xdg/PlasmaDiscoverUpdates < Date: Feb 09 2025 20:51:51 +0000 Subject: [PATCH 6/6] comps-sync f42 2025-02-09 See: https://pagure.io/fedora-comps/pull-request/1080 See: https://pagure.io/fedora-comps/pull-request/1085 --- diff --git a/common-packages.yaml b/common-packages.yaml index 00329cf..6860ab3 100644 --- a/common-packages.yaml +++ b/common-packages.yaml @@ -72,6 +72,7 @@ packages: - glibc - glibc-all-langpacks - gnupg2 + - gstreamer1-plugin-dav1d - gstreamer1-plugin-libav - gstreamer1-plugins-bad-free - gstreamer1-plugins-good diff --git a/lxqt-atomic-packages.yaml b/lxqt-atomic-packages.yaml index 6870c54..ef090ba 100644 --- a/lxqt-atomic-packages.yaml +++ b/lxqt-atomic-packages.yaml @@ -20,6 +20,7 @@ packages: - lxqt-session - lxqt-themes - lxqt-themes-fedora + - lxqt-wayland-session-default-compositor-miriway - mesa-dri-drivers - mesa-vulkan-drivers - network-manager-applet @@ -33,5 +34,6 @@ packages: - qterminal - sddm - sddm-themes + - sddm-wayland-miriway - upower - xdg-user-dirs