diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 699b956..3e68bf7 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -1,12 +1,6 @@ # This file has a list of packages to skip from comps that we don't want, plus # 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 exclude_list_groups: - libreoffice diff --git a/comps-sync.py b/comps-sync.py index 1b14b08..7c236de 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -100,7 +100,6 @@ manifest_packages = load_packages_from_manifest(manifest_path) with open('comps-sync-exclude-list.yml', encoding='UTF-8') as f: doc = yaml.safe_load(f) comps_exclude_list = doc['exclude_list'] - comps_include_list = doc['include_list'] comps_exclude_list_groups = doc['exclude_list_groups'] comps_desktop_exclude_list = doc['desktop_exclude_list'] comps_exclude_list_all = [re.compile(x) for x in doc['exclude_list_all_regexp']] @@ -135,8 +134,7 @@ for arch in manifest_packages: else: if pkg in ws_pkgs and arch in ws_pkgs[pkg][2]: 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 n_manifest_new = len(comps_unknown) diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml index 34a6717..9dde184 100644 --- a/fedora-common-ostree-pkgs.yaml +++ b/fedora-common-ostree-pkgs.yaml @@ -95,8 +95,6 @@ packages: - iwlwifi-dvm-firmware - iwlwifi-mvm-firmware - kbd - - kernel - - kernel-modules-extra - less - libertas-firmware - libglvnd-gles diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 524e0b0..a94de60 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -17,6 +17,10 @@ include: fedora-common-ostree-pkgs.yaml # aarch64: bootupd.yaml 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 - git-core # Explicitely add Git docs