From d007f57ce42686be6405458ce5f4fe216630d345 Mon Sep 17 00:00:00 2001 From: Carl George Date: Aug 26 2021 22:03:33 +0000 Subject: Sync with RHEL 8.5 --- diff --git a/c8-stream.conf b/c8-stream.conf index 767fd17..fdd6219 100644 --- a/c8-stream.conf +++ b/c8-stream.conf @@ -10,10 +10,10 @@ version = "8" # GENERAL SETTINGS comps_file = { - 'scm': 'git', - 'repo': 'https://git.centos.org/centos/comps.git', - 'branch': 'master', - 'file': 'comps-centos-8-stream.xml', + "scm": "git", + "repo": "https://git.centos.org/centos/comps.git", + "branch": "master", + "file": "comps-centos-8-stream.xml", } link_type = 'hardlink-or-copy' @@ -22,15 +22,15 @@ sigkeys = ['8483C65D'] tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64'] module_defaults_dir = { - 'scm': 'git', - 'repo': 'https://git.centos.org/centos/centos-module-defaults.git', - 'branch': 'c8s', - 'dir': '.', + "scm": "git", + "repo": "https://git.centos.org/centos/centos-module-defaults.git", + "branch": "c8s", + "dir": ".", } multilib = [ - ('^.*$', { - 'x86_64': ['devel', 'runtime'] + ("^.*$", { + "x86_64": ["devel", "runtime"] }), ] @@ -105,8 +105,9 @@ lorax_options = [ }) ] +# Skip buildinstall for AppStream for all architectures buildinstall_skip = [ - ("^(AppStream|PowerTools|CR|HighAvailability|RT|ResilientStorage|NFV)$", { + ("^(AppStream|HighAvailability|ResilientStorage|RT|NFV|PowerTools|CR)$", { "*": True }), ] @@ -122,9 +123,9 @@ image_volid_formats = [ '{release_short}-{version}-{arch}-{disc_type}', ] create_optional_isos = False createiso_skip = [ - ('^(BaseOS|AppStream|PowerTools|HighAvailability|CR|RT|ResilientStorage|NFV)$', { - '*': True, - 'src':True + ("^(BaseOS|AppStream|PowerTools|HighAvailability|CR|RT|ResilientStorage|NFV)$", { + "*": True, + "src":True }), ] diff --git a/stream-include-excludes.conf b/stream-include-excludes.conf index ee291df..ac0ef79 100644 --- a/stream-include-excludes.conf +++ b/stream-include-excludes.conf @@ -199,6 +199,7 @@ additional_packages = [ "dotnet-sdk-5.0-source-built-artifacts", "libcomps-devel", #RhBug 1960616 "sblim-gather-provider", #RHBug 1959078, RHELCMP-6212 + "tesseract-devel", # RHELCMP-5762 ] }),