diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc1afa3..d461ed9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,3 +29,4 @@ build: - base-atomic - cosmic-atomic # - kinoite-nightly + # - kinoite-devel diff --git a/comps-sync-devel.py b/comps-sync-devel.py new file mode 100755 index 0000000..f45286f --- /dev/null +++ b/comps-sync-devel.py @@ -0,0 +1,140 @@ +#!/usr/bin/python3 + +''' +Usage: ./comps-sync-devel.py + +Filter KDE package to create the devel manifest. +''' + +import argparse +import re +import sys +import yaml + +ARCHES = ("x86_64", "aarch64", "ppc64le") + +excludelist = [ + 'akonadi-server', + 'akonadi-server-mysql', + 'ark', + 'audiocd-kio', + 'bluedevil', + 'breeze-icon-theme', + 'colord-kde', + 'dolphin', + 'filelight', + 'flatpak-kcm', + 'kaccounts-integration-qt6', + 'kaccounts-providers', + 'kcharselect', + 'kde-connect', + 'kde-gtk-config', + 'kde-inotify-survey', + 'kde-partitionmanager', + 'kde-settings-pulseaudio', + 'kdegraphics-thumbnailers', + 'kdeplasma-addons', + 'kdialog', + 'kdnssd', + 'kf6-baloo-file', + 'kfind', + 'khelpcenter', + 'kinfocenter', + 'kio-admin', + 'kio-gdrive', + 'kmenuedit', + 'kmousetool', + 'konsole', + 'krfb', + 'kscreen', + 'kscreenlocker', + 'kwalletmanager5', + 'kwin', + 'kwrite', + 'pam-kwallet', + 'phonon-qt6-backend-vlc', + 'plasma-breeze', + 'plasma-desktop', + 'plasma-desktop-doc', + 'plasma-discover', + 'plasma-discover-notifier', + 'plasma-disks', + 'plasma-drkonqi', + 'plasma-nm', + 'plasma-nm-openconnect', + 'plasma-nm-openvpn', + 'plasma-nm-vpnc', + 'plasma-pa', + 'plasma-print-manager', + 'plasma-systemmonitor', + 'plasma-thunderbolt', + 'plasma-vault', + 'plasma-welcome', + 'plasma-workspace', + 'plasma-workspace-geolocation', + 'plasma-workspace-wallpapers', + 'plasma-workspace-wayland', + 'polkit-kde', + 'sddm-kcm', + 'signon-kwallet-extension', + 'spectacle', + 'xwaylandvideobridge', +] + +def main(): + + with open("kinoite-devel-packages.yaml", encoding='UTF-8') as f: + manifest = yaml.safe_load(f) + + packages = [] + packages_x86_64 = [] + packages_aarch64 = [] + packages_ppc64le = [] + + for p in set(manifest['packages']): + if p in excludelist: + print(f"Excluding: {p}") + else: + packages.append(p) + + + for p in set(manifest['packages-x86_64']): + if p in excludelist: + print(f"Excluding: {p}") + else: + packages_x86_64.append(p) + + for p in set(manifest['packages-aarch64']): + if p in excludelist: + print(f"Excluding: {p}") + else: + packages_aarch64.append(p) + + # for p in set(manifest['packages-ppc64le']): + # if p in excludelist: + # print(f"Excluding: {p}") + # else: + # packages_ppc64le.append(p) + + # print(packages) + # print(packages_x86_64) + # print(packages_aarch64) + # print(packages_ppc64le) + + with open("kde-desktop-pkgs-devel.yaml", 'w', encoding='UTF-8') as f: + f.write("# DO NOT EDIT! This content is generated from comps-sync-devel.py\n") + f.write("packages:\n") + for pkg in sorted(packages): + f.write(f' - {pkg}\n') + if packages_x86_64: + for pkg in sorted(packages_x86_64): + f.write(f' - {pkg}\n') + if packages_aarch64: + for pkg in sorted(packages_aarch64): + f.write(f' - {pkg}\n') + + print('Wrote kinoite-devel-packages.yaml') + + +if __name__ == "__main__": + main() diff --git a/justfile b/justfile index 00a2cce..752f412 100644 --- a/justfile +++ b/justfile @@ -14,6 +14,7 @@ pretty_names := '( [kinoite-nightly]="Kinoite" [kinoite-beta]="Kinoite" [kinoite-mobile]="Kinoite" + [kinoite-devel]="Kinoite" [sway-atomic]="Sway Atomic" [budgie-atomic]="Budgie Atomic" [xfce-atomic]="XFCE Atomic" @@ -38,6 +39,7 @@ volume_id_substitutions := '( [kinoite-nightly]="Kin" [kinoite-beta]="Kin" [kinoite-mobile]="Kin" + [kinoite-devel]="Kin" [sway-atomic]="SwA" [budgie-atomic]="BdA" [xfce-atomic]="XfA" diff --git a/kinoite-devel-packages.yaml b/kinoite-devel-packages.yaml new file mode 100644 index 0000000..7aebc75 --- /dev/null +++ b/kinoite-devel-packages.yaml @@ -0,0 +1,20 @@ +# DO NOT EDIT! This content is generated from comps-sync-devel.py +packages: + - NetworkManager-config-connectivity-fedora + - adwaita-gtk2-theme + - ffmpegthumbs + - firewall-config + - fprintd-pam + - glibc-all-langpacks + - gnome-keyring-pam + - libappindicator-gtk3 + - mesa-dri-drivers + - mesa-vulkan-drivers + - pinentry-qt + - plymouth-system-theme + - sddm + - sddm-breeze + - sddm-wayland-plasma + - systemd-oomd-defaults + - udisks2 + - vlc-plugin-gstreamer diff --git a/kinoite-devel.yaml b/kinoite-devel.yaml new file mode 100644 index 0000000..11fe38d --- /dev/null +++ b/kinoite-devel.yaml @@ -0,0 +1,51 @@ +include: + - fedora-common-ostree.yaml + - kinoite-devel-packages.yaml + - common-bootable-containers-kinoite.yaml + +ref: fedora/rawhide/${basearch}/kinoite-devel +rojig: + name: fedora-kde + summary: "Fedora Kinoite (Development)" + license: MIT + +packages: + - fedora-release-kinoite + # Install some minor optional tools for KInfoCenter + - vulkan-tools + - xdpyinfo + # Includes a KIO & KCM (can not be Flatpak'ed), used by Dolphin and Gwenview + # See https://pagure.io/fedora-kde/SIG/issue/291 + # - kamera + # Make sure that previous Anaconda dependencies are kept in the image + # See: https://pagure.io/fedora-kde/SIG/issue/243 + - bcache-tools + - dmraid + - mobile-broadband-provider-info + # Make sure that modem support is installed + - NetworkManager-ppp + # Install gdb to make getting backtraces work with DrKonqi + # The dnf dependency is excluded in the common manifest + - gdb + # Testing https://pagure.io/fedora-kde/SIG/issue/109 + # - kdenetwork-filesharing + - samba-usershares + +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + - plasma-discover-offline-updates + - plasma-discover-packagekit + - plasma-pk-updates + # Manually excluded as recommended by gtk3 (and likely gtk4 in the future) + # See https://pagure.io/fedora-kde/SIG/issue/124 + - tracker + - tracker-miners + # Ensure we do not include X11 support + - plasma-x11 + - plasma-workspace-x11 + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-41 + # - fedora-41-updates