diff --git a/r8-armhfp.conf b/r8-armhfp.conf index ea873d8..9718101 100644 --- a/r8-armhfp.conf +++ b/r8-armhfp.conf @@ -54,10 +54,10 @@ filter_system_release_packages = False gather_prepopulate = "rocky-armhfp-packages.json" gather_method = { - "^(?!(AppStream|PowerTools|CR)).*$": { + "^(?!(AppStream|PowerTools)).*$": { "comps": "deps" }, - "^(AppStream|PowerTools|CR)$": "hybrid", + "^(AppStream|PowerTools)$": "hybrid", } gather_backend = "dnf" diff --git a/r8-devel.conf b/r8-devel.conf index a9f2c4b..064bfbf 100644 --- a/r8-devel.conf +++ b/r8-devel.conf @@ -55,10 +55,10 @@ filter_system_release_packages = False gather_prepopulate = "rocky-packages.json" gather_method = { - "^(?!(AppStream|PowerTools|CR)).*$":{ + "^(?!(AppStream|PowerTools)).*$":{ "comps": "deps" }, - "^(AppStream|PowerTools|CR)$": "hybrid", + "^(AppStream|PowerTools)$": "hybrid", } gather_backend = "dnf" @@ -82,7 +82,7 @@ create_jigdo = False buildinstall_skip = [ - ("^(Devel|AppStream|PowerTools|CR|HighAvailability)$", { + ("^(Devel|AppStream|PowerTools|HighAvailability)$", { "*": True }), ] diff --git a/r8.conf b/r8.conf index c683540..05c25d4 100644 --- a/r8.conf +++ b/r8.conf @@ -58,10 +58,10 @@ filter_system_release_packages = False gather_prepopulate = "rocky-packages.json" gather_method = { - "^(?!(AppStream|PowerTools|CR)).*$":{ + "^(?!(AppStream|PowerTools)).*$":{ "comps": "deps" }, - "^(AppStream|PowerTools|CR)$": "hybrid", + "^(AppStream|PowerTools)$": "hybrid", } gather_backend = "dnf" @@ -99,7 +99,7 @@ lorax_options = [ ] buildinstall_skip = [ - ("^(AppStream|PowerTools|CR|HighAvailability)$", { + ("^(AppStream|PowerTools|HighAvailability)$", { "*": True }), ] @@ -116,7 +116,7 @@ image_volid_formats = [ '{release_short}-8.3-{arch}-{disc_type}', ] create_optional_isos = False createiso_skip = [ - ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|CR)$', { + ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability)$', { '*': True, 'src':True }),