atomic-desktops/ci-test
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

comps-sync.py: Remove special case for kernel packages

Browse source
This commit is contained in:
Timothée Ravier 2023-09-27 10:45:36 +02:00
parent cf4dcc7206
commit 06fcdac6f3
4 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
comps-sync-exclude-list.yml
View file

@ -1,12 +1,6 @@
# This file has a list of packages to skip from comps that we don't want, plus # This file has a list of packages to skip from comps that we don't want, plus
# a few include listed things. # a few include listed things.
# For some reason today these are just in livecd-tools...
include_list:
- kernel
- kernel-modules
- kernel-modules-extra
# Entirely skip all packages in libreoffice # Entirely skip all packages in libreoffice
exclude_list_groups: exclude_list_groups:
- libreoffice - libreoffice

2
comps-sync.py
View file

@ -100,7 +100,6 @@ manifest_packages = load_packages_from_manifest(manifest_path)
with open('comps-sync-exclude-list.yml', encoding='UTF-8') as f: with open('comps-sync-exclude-list.yml', encoding='UTF-8') as f:
doc = yaml.safe_load(f) doc = yaml.safe_load(f)
comps_exclude_list = doc['exclude_list'] comps_exclude_list = doc['exclude_list']
comps_include_list = doc['include_list']
comps_exclude_list_groups = doc['exclude_list_groups'] comps_exclude_list_groups = doc['exclude_list_groups']
comps_desktop_exclude_list = doc['desktop_exclude_list'] comps_desktop_exclude_list = doc['desktop_exclude_list']
comps_exclude_list_all = [re.compile(x) for x in doc['exclude_list_all_regexp']] comps_exclude_list_all = [re.compile(x) for x in doc['exclude_list_all_regexp']]
@ -135,7 +134,6 @@ for arch in manifest_packages:
else: else:
if pkg in ws_pkgs and arch in ws_pkgs[pkg][2]: if pkg in ws_pkgs and arch in ws_pkgs[pkg][2]:
continue continue
if (pkg not in comps_include_list):
comps_unknown.add((pkg, arch)) comps_unknown.add((pkg, arch))
# Look for packages in the manifest but not in comps at all # Look for packages in the manifest but not in comps at all

2
fedora-common-ostree-pkgs.yaml
View file

@ -95,8 +95,6 @@ packages:
- iwlwifi-dvm-firmware - iwlwifi-dvm-firmware
- iwlwifi-mvm-firmware - iwlwifi-mvm-firmware
- kbd - kbd
- kernel
- kernel-modules-extra
- less - less
- libertas-firmware - libertas-firmware
- libglvnd-gles - libglvnd-gles

4
fedora-common-ostree.yaml
View file

@ -17,6 +17,10 @@ include: fedora-common-ostree-pkgs.yaml
# aarch64: bootupd.yaml # aarch64: bootupd.yaml
packages: packages:
# Ensure that we have a kernel. Kernel packages are not in any comps group
- kernel
- kernel-modules
- kernel-modules-extra
# Do not include "full" Git as it brings in Perl # Do not include "full" Git as it brings in Perl
- git-core - git-core
# Explicitely add Git docs # Explicitely add Git docs