From b473644f8c37089bde58c6f2f62df4796784458c Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 05 2025 21:55:09 +0000 Subject: 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 6258201..6b0550e 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 9ea2291..a1c97dd 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