From a53b5956fb3cf01de4d5b8d79d3cec5f9c5debfe Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Wed, 9 Oct 2024 17:43:50 -0700 Subject: [PATCH] sync from upstream --- shared/additional_and_filter_packages.conf | 2 +- shared/createiso.conf | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf index 2600ce2..c3dd791 100644 --- a/shared/additional_and_filter_packages.conf +++ b/shared/additional_and_filter_packages.conf @@ -127,6 +127,7 @@ additional_packages = [ "egl-utils", #ENGCMP-2476 "evolution-data-server-ui", #ENGCMP-3478 "evolution-data-server-ui-devel", #ENGCMP-3477 + "fftw-openmpi-static", #RHEL-47498 "fido2-tools", #ENGCMP-3526 "firefox-x11", #ENGCMP-2806 "flexiblas-openblas-serial", #ENGCMP-4292 @@ -417,7 +418,6 @@ additional_packages = [ "gcc-toolset-14-libtsan-devel", #ENGCMP-3954 "gcc-toolset-14-libubsan-devel", #ENGCMP-3954 "gcc-toolset-14-offload-nvptx", #ENGCMP-3954 - "openscap-report", #ENGCMP-4097 "libkdumpfile-devel", #ENGCMP-4160 "aspnetcore-runtime-dbg-8.0", #ENGCMP-4088 "dotnet-runtime-dbg-8.0", #ENGCMP-4088 diff --git a/shared/createiso.conf b/shared/createiso.conf index 4e11974..952bee6 100644 --- a/shared/createiso.conf +++ b/shared/createiso.conf @@ -19,6 +19,9 @@ createiso_skip = [ "*": True, "src": True }), + ("^(SAP|SAPHANA)$", { + "*": True, + }), ] restricted_volid = True