From ed6fcea74c5d8e9dcf8efcfd6ca52bbc3d6cacc5 Mon Sep 17 00:00:00 2001 From: Carl George Date: Jan 19 2022 17:01:56 +0000 Subject: Sync with RHEL 8.6 --- diff --git a/stream-include-excludes.conf b/stream-include-excludes.conf index 85fc734..46213c0 100644 --- a/stream-include-excludes.conf +++ b/stream-include-excludes.conf @@ -42,7 +42,7 @@ filter_packages = [ additional_packages = [ ("^AppStream$", { "*": [ - "ansible-collection-redhat-rhel_mgmt", #RHELCMP-6300 RhBug 1992497 + "ansible-collection-redhat-rhel_mgmt", #RHELCMP-6300 RhBug 1992497 "bind9.16", #ENGCMP-1675 "bind9.16-chroot", #ENGCMP-1675 "bind9.16-utils", #ENGCMP-1675 @@ -90,7 +90,7 @@ additional_packages = [ "swtpm", # Jira: RHELCMP-6824 "libtpms", # RHELCMP-6729 "qatzip", # RHELCMP-7085 - "qatzip-libs", #ENGCMP-1643 + "qatzip-libs", #ENGCMP-1643 "weldr-client", # RHELCMP-7099 "leapp", # RHBug: 2017461, Jira: RHELCMP-7153 "leapp-repository", # RHELCMP-7154 @@ -110,17 +110,17 @@ additional_packages = [ "osbuild-composer-dnf-json", #ENGCMP-1606 "python38-resolvelib", #RHELCMP-7210 "sshpass", #RHELCMP-7206 - "rsyslog-mmfields", #ENGCMP-1641 + "rsyslog-mmfields", #ENGCMP-1641 "fido-device-onboard", # RHBug: 2024180, RHELCMP-7321 "gnome-shell-extension-heads-up-display", #ENGCMP-1644 - + "hyperv-tools", #ENGCMP-1668 "nmstate-libs", #ENGCMP-1702 "php-pecl-xdebug3", #ENGCMP-1718 "fdo-init", #ENGCMP-1717 "fdo-client", #ENGCMP-1717 "fdo-owner-cli", #ENGCMP-1717 - - + "ansible-core", #ENGCMP-1722 + "ansible-test", "osbuild-lvm2", #ENGCMP-1731 "osbuild-luks2", "hostapd", # ENGCMP-1720 @@ -135,7 +135,7 @@ additional_packages = [ "python3-debuginfo", # RCM-73713 "compat-hwloc1", #RhBug 1979150 "libqrtr-glib", #RHBug 2016402, RHELCMP-7140 - "shadow-utils-subid", #ENGCMP-1597 + "shadow-utils-subid", #ENGCMP-1597 ] }), @@ -158,7 +158,7 @@ additional_packages = [ "libcomps-devel", #RhBug 1960616 "sblim-gather-provider", #RHBug 1959078, RHELCMP-6212 "tesseract-devel", # RHELCMP-5762 - "shadow-utils-subid-devel", #ENGCMP-1597 + "shadow-utils-subid-devel", #ENGCMP-1597 ] }), diff --git a/variants-stream.xml b/variants-stream.xml index fa6c408..305cb04 100644 --- a/variants-stream.xml +++ b/variants-stream.xml @@ -189,10 +189,12 @@ perl:5.24 perl:5.26 perl:5.30 + perl:5.32 perl-FCGI:0.78 php:7.2 php:7.3 php:7.4 + php:8.0 pki-core:10.6 pki-deps:10.6 pmdk:1-fileformat-v6