From e6f2fb746f76f6a3d1db54e3c1829dde84738c3a Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Mon, 13 Feb 2023 10:13:06 -0700 Subject: [PATCH] sync from upstream --- shared/additional_and_filter_packages.conf | 39 ++++++++++++---------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf index d76a718..fb80bab 100644 --- a/shared/additional_and_filter_packages.conf +++ b/shared/additional_and_filter_packages.conf @@ -96,25 +96,25 @@ additional_packages = [ "gcc-toolset-12-build", #ENGCMP-2391 "gcc-toolset-12-dwz", #ENGCMP-2402 "gcc-toolset-12-gcc", #ENGCMP-2405 - "gcc-toolset-12-gcc-c++", #ENGCMP-2405 - "gcc-toolset-12-gcc-gfortran", #ENGCMP-2405 + "gcc-toolset-12-gcc-c++", #ENGCMP-2405 + "gcc-toolset-12-gcc-gfortran", #ENGCMP-2405 "gcc-toolset-12-gcc-plugin-annobin", #ENGCMP-2805 - "gcc-toolset-12-gcc-plugin-devel", #ENGCMP-2405 + "gcc-toolset-12-gcc-plugin-devel", #ENGCMP-2405 "gcc-toolset-12-gdb", #ENGCMP-2416 "gcc-toolset-12-gdbserver", #ENGCMP-2416 - "gcc-toolset-12-libasan-devel", #ENGCMP-2405 - "gcc-toolset-12-libatomic-devel", #ENGCMP-2405 - "gcc-toolset-12-libgccjit", #ENGCMP-2405 - "gcc-toolset-12-libgccjit-devel", #ENGCMP-2405 - "gcc-toolset-12-libgccjit-docs", #ENGCMP-2405 - "gcc-toolset-12-libitm-devel", #ENGCMP-2405 - "gcc-toolset-12-liblsan-devel", #ENGCMP-2405 - "gcc-toolset-12-libquadmath-devel", #ENGCMP-2405 - "gcc-toolset-12-libstdc++-devel", #ENGCMP-2405 - "gcc-toolset-12-libstdc++-docs", #ENGCMP-2405 - "gcc-toolset-12-libtsan-devel", #ENGCMP-2405 - "gcc-toolset-12-libubsan-devel", #ENGCMP-2405 - "gcc-toolset-12-offload-nvptx", #ENGCMP-2405 + "gcc-toolset-12-libasan-devel", #ENGCMP-2405 + "gcc-toolset-12-libatomic-devel", #ENGCMP-2405 + "gcc-toolset-12-libgccjit", #ENGCMP-2405 + "gcc-toolset-12-libgccjit-devel", #ENGCMP-2405 + "gcc-toolset-12-libgccjit-docs", #ENGCMP-2405 + "gcc-toolset-12-libitm-devel", #ENGCMP-2405 + "gcc-toolset-12-liblsan-devel", #ENGCMP-2405 + "gcc-toolset-12-libquadmath-devel", #ENGCMP-2405 + "gcc-toolset-12-libstdc++-devel", #ENGCMP-2405 + "gcc-toolset-12-libstdc++-docs", #ENGCMP-2405 + "gcc-toolset-12-libtsan-devel", #ENGCMP-2405 + "gcc-toolset-12-libubsan-devel", #ENGCMP-2405 + "gcc-toolset-12-offload-nvptx", #ENGCMP-2405 "gcc-toolset-12-runtime", #ENGCMP-2391 "gnome-kiosk-script-session", #ENGCMP-2499 "gnome-kiosk-search-appliance", #ENGCMP-2499 @@ -139,7 +139,7 @@ additional_packages = [ "libi2cd-devel", #ENGCMP-2428 "libnxz", #ENGCMP-2576 "libsepol-utils", #ENGCMP-2399 - "libtsan2", #ENGCMP-2405 + "libtsan2", #ENGCMP-2405 "libxcvt", #ENGCMP-2791 CS-1322 "libzdnn", #ENGCMP-2244 "libzdnn-devel", #ENGCMP-2297 @@ -157,10 +157,12 @@ additional_packages = [ "python3.11", #ENGCMP-2833 "python3.11-charset-normalizer", #ENGCMP-2914 "python3.11-idna", #ENGCMP-2888 + "python3.11-numpy", #ENGCMP-2933 "python3.11-pip", #ENGCMP-2858 "python3.11-ply", #ENGCMP-2911 "python3.11-pysocks", #ENGCMP-2912 "python3.11-pyyaml", #ENGCMP-2910 + "python3.11-requests", #ENGCMP-2940 "python3.11-setuptools", #ENGCMP-2860 "python3.11-six", #ENGCMP-2872 "python3.11-wheel", #ENGCMP-2873 @@ -176,6 +178,7 @@ additional_packages = [ "python3-pyqt5-sip", #ENGCMP-2370 "python3-sqlalchemy", #ENGCMP-2423 "python3-tornado", #ENGCMP-2418 + "python3.11-urllib3", #ENGCMP-2932 "python3-virt-firmware", #ENGCMP-2726 "python3-wcwidth", #ENGCMP-2093 "qatlib-service", #ENGCMP-2490 @@ -217,7 +220,7 @@ additional_packages = [ }), ("^CRB$", { "*": [ - ], + ], "x86_64": [ "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327 "java-11-openjdk-*slowdebug*", #ENGCMP-1327