From 8ea19f22a80c50ec1c20d2e2791959986ae7f821 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Mon, 12 Aug 2024 18:57:26 -0700 Subject: [PATCH] sync from upstream --- shared/additional_and_filter_packages.conf | 5 +++-- shared/multilib.conf | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf index 5f00a54..40bae9b 100644 --- a/shared/additional_and_filter_packages.conf +++ b/shared/additional_and_filter_packages.conf @@ -109,6 +109,8 @@ additional_packages = [ "cepces-selinux", #ENGCMP-3803 "cockpit-ostree", #ENGCMP-3233 "composefs", #ENGCMP-3802 + "cxl-cli", #ENGCMP-4294 + "cxl-libs", #ENGCMP-4294 "dotnet-apphost-pack-7.0", #ENGCMP-2586 "dotnet-apphost-pack-8.0", #ENGCMP-3375 "dotnet-host", #ENGCMP-2586 @@ -438,13 +440,12 @@ additional_packages = [ "bind9.18-libs", #ENGCMP-4271 "bind9.18-chroot", #ENGCMP-4271 "opentelemetry-collector", #ENGCMP-4301 + "rust-std-static-wasm32-wasip1", #ENGCMP-4302 ] }), ("^AppStream$", { "x86_64": [ "awscli2", #ENGCMP-4025 - "cxl-cli", #ENGCMP-2743 - "cxl-libs", #ENGCMP-2743 "libreoffice", #ENGCMP-2968 "open-vm-tools-salt-minion", #ENGCMP-2295 "pcp-pmda-resctrl", #ENGCMP-3576 diff --git a/shared/multilib.conf b/shared/multilib.conf index e2c8640..d4b8011 100644 --- a/shared/multilib.conf +++ b/shared/multilib.conf @@ -51,6 +51,7 @@ multilib_whitelist = { "gcc-toolset-9-valgrind", # RCM-60082 "p11-kit-trust", # RCM-62077 "gcc-toolset-13-libgccjit", #ENGCMP-3279 + "gcc-toolset-14-libgccjit", #ENGCMP-4328 "openssl-fips-provider", #ENGCMP-3868 ], }