From 52e0ce37687125e5c647e38096566663cb5a2a19 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Aug 20 2025 16:57:49 +0000 Subject: Drop deepin The deepin-desktop package, which is critical to Deepin working, got retired for long-term FTI. Given this, it seems pointless to keep this variant around at least until it's fixed. I've sent https://pagure.io/fedora-comps/pull-request/1149 to remove deepin from comps, this is the corresponding change here. Signed-off-by: Adam Williamson --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 2ba2af6..f0ee872 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -235,9 +235,6 @@ desktop_exclude_list: - dnfdragora-updater # X11 is going away with Plasma 6 - sddm-x11 - deepin-desktop: - # Incompatible with ostree for various reasons - - dnfdragora-updater mate-desktop: # Incompatible with ostree for various reasons - abrt-desktop diff --git a/comps-sync.py b/comps-sync.py index 14ce151..d584867 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -196,7 +196,6 @@ def main(): "budgie-atomic": ["budgie-desktop", "budgie-desktop-apps", "base-x"], "cinnamon-atomic": ["cinnamon-desktop", "base-x"], "cosmic-atomic": ["cosmic-desktop", "cosmic-desktop-apps", "base-graphical"], - "deepin-atomic": ["deepin-desktop", "base-x"], "kinoite": ["kde-desktop", "base-graphical"], "kinoite-mobile": ["kde-mobile", "kde-mobile-apps", "base-graphical"], "lxqt-atomic": ["lxqt-desktop", "base-graphical"], diff --git a/deepin-atomic-packages.yaml b/deepin-atomic-packages.yaml deleted file mode 100644 index 9b1253d..0000000 --- a/deepin-atomic-packages.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - chromium - - deepin-calculator - - deepin-calendar - - deepin-desktop - - deepin-file-manager - - deepin-icon-theme - - deepin-image-viewer - - deepin-picker - - deepin-screenshot - - deepin-system-monitor - - firewall-config - - glx-utils - - mesa-dri-drivers - - mesa-vulkan-drivers - - plymouth-system-theme - - xorg-x11-drv-amdgpu - - xorg-x11-drv-ati - - xorg-x11-drv-evdev - - xorg-x11-drv-libinput - - xorg-x11-drv-nouveau - - xorg-x11-drv-qxl - - xorg-x11-drv-wacom - - xorg-x11-server-Xorg - - xorg-x11-xauth - - xorg-x11-xinit -packages-x86_64: - - xorg-x11-drv-intel - - xorg-x11-drv-openchrome - - xorg-x11-drv-vmware diff --git a/deepin-atomic.yaml b/deepin-atomic.yaml deleted file mode 100644 index 17e878b..0000000 --- a/deepin-atomic.yaml +++ /dev/null @@ -1,25 +0,0 @@ -variables: - variant: "deepin-atomic" - -include: - - common.yaml - - deepin-atomic-packages.yaml - -ref: fedora/rawhide/${basearch}/deepin -rojig: - name: fedora-deepin - summary: "Fedora Deepin Atomic" - license: MIT - -packages: - # Generic release package for desktop variants - - fedora-release - - fedora-release-ostree-desktop - # GUI to manage updates & Flatpaks - - gnome-software - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-44 - # - fedora-44-updates