From e2b5654f804faaf12cf9f255df22a075273b5214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 13 Oct 2025 21:14:50 +0200 Subject: [PATCH] packages: Move comps sync'ed package lists to a sub dir Those manifests are automatically generated so let's move them out of the way as we never edit them manually. --- REUSE.toml | 1 + budgie-atomic-common.yaml | 2 +- common.yaml | 2 +- comps-sync.py | 4 ++-- cosmic-atomic-common.yaml | 2 +- kinoite-common.yaml | 4 ++-- budgie-atomic-packages.yaml => packages/budgie-atomic.yaml | 0 common-packages.yaml => packages/common.yaml | 0 cosmic-atomic-packages.yaml => packages/cosmic-atomic.yaml | 0 kinoite-mobile-packages.yaml => packages/kinoite-mobile.yaml | 0 kinoite-packages.yaml => packages/kinoite.yaml | 0 silverblue-packages.yaml => packages/silverblue.yaml | 0 sway-atomic-packages.yaml => packages/sway-atomic.yaml | 0 silverblue-common.yaml | 2 +- sway-atomic-common.yaml | 2 +- 15 files changed, 10 insertions(+), 9 deletions(-) rename budgie-atomic-packages.yaml => packages/budgie-atomic.yaml (100%) rename common-packages.yaml => packages/common.yaml (100%) rename cosmic-atomic-packages.yaml => packages/cosmic-atomic.yaml (100%) rename kinoite-mobile-packages.yaml => packages/kinoite-mobile.yaml (100%) rename kinoite-packages.yaml => packages/kinoite.yaml (100%) rename silverblue-packages.yaml => packages/silverblue.yaml (100%) rename sway-atomic-packages.yaml => packages/sway-atomic.yaml (100%) diff --git a/REUSE.toml b/REUSE.toml index 562532a..d2a20ea 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -4,6 +4,7 @@ version = 1 path = [ "*.repo", "*.yaml", + "packages/*.yaml", ".gitignore", "README.md", "ci/*", diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml index 7f41dbd..845f895 100644 --- a/budgie-atomic-common.yaml +++ b/budgie-atomic-common.yaml @@ -8,7 +8,7 @@ ref: fedora/rawhide/${basearch}/onyx include: - common.yaml - - budgie-atomic-packages.yaml + - packages/budgie-atomic.yaml packages: - fedora-release-budgie-atomic diff --git a/common.yaml b/common.yaml index 119c33e..0d31df5 100644 --- a/common.yaml +++ b/common.yaml @@ -13,7 +13,7 @@ container-cmd: include: # Packages common to all variants - - common-packages.yaml + - packages/common.yaml # See: https://gitlab.com/fedora/ostree/sig/-/issues/1 - bootupd.yaml # Dracut configuration for the initramfs diff --git a/comps-sync.py b/comps-sync.py index c3efcdc..56cfb65 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -192,7 +192,7 @@ def main(): # Return code indicates if changes have or would have been done ret = 0 - ret += update_manifests_from_groups(comps, groups, 'common-packages.yaml', "common", args.save, comps_exclude_list, comps_exclude_list_all) + ret += update_manifests_from_groups(comps, groups, 'packages/common.yaml', "common", args.save, comps_exclude_list, comps_exclude_list_all) # List of comps groups used for each variant variant_comps_groups = { @@ -207,7 +207,7 @@ def main(): # Generate treefiles for all variants for variant, groups in variant_comps_groups.items(): print() - ret += update_manifests_from_groups(comps, groups, f'{variant}-packages.yaml', variant, args.save, comps_desktop_exclude_list, comps_exclude_list_all) + ret += update_manifests_from_groups(comps, groups, f'packages/{variant}.yaml', variant, args.save, comps_desktop_exclude_list, comps_exclude_list_all) if not args.save and ret != 0: sys.exit(1) diff --git a/cosmic-atomic-common.yaml b/cosmic-atomic-common.yaml index 044acd6..1316369 100644 --- a/cosmic-atomic-common.yaml +++ b/cosmic-atomic-common.yaml @@ -8,7 +8,7 @@ ref: fedora/rawhide/${basearch}/cosmic-atomic include: - common.yaml - - cosmic-atomic-packages.yaml + - packages/cosmic-atomic.yaml packages: - fedora-release-cosmic-atomic diff --git a/kinoite-common.yaml b/kinoite-common.yaml index 3279095..67cbbc8 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -14,10 +14,10 @@ include: conditional-include: - if: variant == "kinoite" include: - - kinoite-packages.yaml + - packages/kinoite.yaml - if: variant == "kinoite-mobile" include: - - kinoite-mobile-packages.yaml + - packages/kinoite-mobile.yaml packages: - fedora-release-kinoite diff --git a/budgie-atomic-packages.yaml b/packages/budgie-atomic.yaml similarity index 100% rename from budgie-atomic-packages.yaml rename to packages/budgie-atomic.yaml diff --git a/common-packages.yaml b/packages/common.yaml similarity index 100% rename from common-packages.yaml rename to packages/common.yaml diff --git a/cosmic-atomic-packages.yaml b/packages/cosmic-atomic.yaml similarity index 100% rename from cosmic-atomic-packages.yaml rename to packages/cosmic-atomic.yaml diff --git a/kinoite-mobile-packages.yaml b/packages/kinoite-mobile.yaml similarity index 100% rename from kinoite-mobile-packages.yaml rename to packages/kinoite-mobile.yaml diff --git a/kinoite-packages.yaml b/packages/kinoite.yaml similarity index 100% rename from kinoite-packages.yaml rename to packages/kinoite.yaml diff --git a/silverblue-packages.yaml b/packages/silverblue.yaml similarity index 100% rename from silverblue-packages.yaml rename to packages/silverblue.yaml diff --git a/sway-atomic-packages.yaml b/packages/sway-atomic.yaml similarity index 100% rename from sway-atomic-packages.yaml rename to packages/sway-atomic.yaml diff --git a/silverblue-common.yaml b/silverblue-common.yaml index a10feb2..1006d22 100644 --- a/silverblue-common.yaml +++ b/silverblue-common.yaml @@ -8,7 +8,7 @@ ref: fedora/rawhide/${basearch}/silverblue include: - common.yaml - - silverblue-packages.yaml + - packages/silverblue.yaml packages: - fedora-release-silverblue diff --git a/sway-atomic-common.yaml b/sway-atomic-common.yaml index 9ff80c3..ee3a07f 100644 --- a/sway-atomic-common.yaml +++ b/sway-atomic-common.yaml @@ -8,7 +8,7 @@ ref: fedora/rawhide/${basearch}/sericea include: - common.yaml - - sway-atomic-packages.yaml + - packages/sway-atomic.yaml packages: - fedora-release-sway-atomic