sig_core
/
pungi-rocky
mirror of https://git.rockylinux.org/rocky/pungi-rocky.git
7
0
Fork 0
Code Issues Projects Releases Wiki Activity

sync with upstream 8.7 dev

This commit is contained in:
Louis Abel 2022-09-23 08:35:21 -07:00
parent cd9cfa579c
commit d62a96745c
Signed by: label
GPG Key ID: B37E62D143879B36
4 changed files with 73 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
common/include-excludes.conf
View File

@ -22,6 +22,7 @@ filter_packages = [
"openldap-servers-debuginfo", # RCM-28225
"ongres-scram", # RCM-31750
"libcomps-devel", #RhBug 1960616
"fstrm-utils",
]
}),
@ -60,6 +61,8 @@ additional_packages = [
("^AppStream$", {
"*": [
"ansible-collection-redhat-rhel_mgmt", #RHELCMP-6300 RhBug 1992497
"aspnetcore-runtime-7.0",
"aspnetcore-targeting-pack-7.0",
"bind9.16", #ENGCMP-1675
"bind9.16-chroot", #ENGCMP-1675
"bind9.16-utils", #ENGCMP-1675
@ -67,6 +70,15 @@ additional_packages = [
"bind9.16-license", #ENGCMP-1675
"cockpit-leapp", #ENGCMP-1819
"dotnet",
"dotnet-apphost-pack-7.0",
"dotnet-host",
"dotnet-hostfxr-7.0",
"dotnet-runtime-7.0",
"dotnet-sdk-7.0",
"dotnet-targeting-pack-7.0",
"dotnet-templates-7.0",
"egl-utils",
"frr-selinux",
"libasan5", #RCM-61474
"libubsan1",
"gnome-software-editor",
@ -82,9 +94,23 @@ additional_packages = [
"gcc-toolset-12-annobin-docs", #ENGCMP-2383
"gcc-toolset-12-annobin-plugin-gcc", #ENGCMP-2383
"gcc-toolset-12-binutils", #ENGCMP-2303
"gcc-toolset-12-binutils-devel",
"gcc-toolset-12-build",
"gcc-toolset-12-gcc", #ENGCMP-2338
"gcc-toolset-12-gcc-plugin-devel",
"gcc-toolset-12-gdb", #ENGCMP-2334
"gcc-toolset-12-dwz", #ENGCMP-2339
"gcc-toolset-12-libasan-devel",
"gcc-toolset-12-libatomic-devel",
"gcc-toolset-12-libgccjit",
"gcc-toolset-12-libgccjit-devel",
"gcc-toolset-12-libgccjit-docs",
"gcc-toolset-12-libitm-devel",
"gcc-toolset-12-liblsan-devel",
"gcc-toolset-12-libstdc++-docs",
"gcc-toolset-12-libtsan-devel",
"gcc-toolset-12-libubsan-devel",
"gcc-toolset-12-offload-nvptx",
"virt-v2v", # RHBug 2005288, RHELCMP-6733
"swtpm", # Jira: RHELCMP-6824
"libtpms", # RHELCMP-6729
@ -120,6 +146,7 @@ additional_packages = [
"gnome-shell-extension-gesture-inhibitor", #ENGCMP-1770
"autocorr-en", #ENGCMP-1797
"libabw", #ENGCMP-1847
"libasan8",
"libcdr", #ENGCMP-1847
"libcmis", #ENGCMP-1797
"libexttextcat", #ENGCMP-1797
@ -144,18 +171,47 @@ additional_packages = [
"libreoffice-ure-common", #ENGCMP-1797
"libreoffice-writer", #ENGCMP-1847
"libstaroffice", #ENGCMP-1847
"libstoragemgmt-nfs-plugin",
"libtsan2",
"libzmf", #ENGCMP-1847
"lpsolve", #ENGCMP-1847
"netstandard-targeting-pack-2.1",
"greenboot-default-health-checks", #ENGCMP-1801
"fence-agents-ibm-powervs", #ENGCMP-2002
"fence-agents-ibm-vpc",
"fence-agents-ibm-vpc", #ENGCMP-2030
"fence-agents-kubevirt", #ENGCMP-2002
"fence-virtd-cpg", #ENGCMP-1972
"poppler-qt5",
"poppler-qt5", #ENGCMP-2393
"python3-dnf-plugin-modulesync", #ENGCMP-2018
"python3-lasso", #ENGCMP-2278
"qatlib-service",
"qt5-qt3d-doc",
"qt5-qtbase-doc",
"qt5-qtconnectivity-doc",
"qt5-qtdeclarative-doc",
"qt5-qtgraphicaleffects-doc",
"qt5-qtimageformats-doc",
"qt5-qtlocation-doc",
"qt5-qtmultimedia-doc",
"qt5-qtquickcontrols-doc",
"qt5-qtquickcontrols2-doc",
"qt5-qtscript-doc",
"qt5-qtsensors-doc",
"qt5-qtserialbus-doc",
"qt5-qtserialport-doc",
"qt5-qtsvg-doc",
"qt5-qttools-doc",
"qt5-qtwayland-doc",
"qt5-qtwebchannel-doc",
"qt5-qtwebsockets-doc",
"qt5-qtx11extras-doc",
"qt5-qtxmlpatterns-doc",
"qt5-doc",
"redhat-cloud-client-configuration", #ENGCMP-2395
"snactor",
"libzdnn", #ENGCMP-2057
"make43",
"make43-devel",
"tuned-profiles-postgresql", #ENGCMP-2126
"ipxe-bootimgs-aarch64", #ENGCMP-2123
"ipxe-bootimgs-x86", #ENGCMP-2123
@ -166,6 +222,9 @@ additional_packages = [
"vulkan-loader-devel", #ENGCMP-2316
"vulkan-tools", #ENGCMP-2316
"vulkan-validation-layers", #ENGCMP-2316
"xmlstarlet",
"xxhash",
"xxhash-libs",
"yara", #ENGCMP-2352
]
}),
@ -176,7 +235,6 @@ additional_packages = [
"open-vm-tools-salt-minion", #ENGCMP-2295
],
"s390x": [],
}),
("^BaseOS$", {
"*": [
@ -184,8 +242,9 @@ additional_packages = [
"compat-hwloc1", #RhBug 1979150
"NetworkManager-initscripts-updown", #ENGCMP-1991
"shadow-utils-subid", #ENGCMP-1597
"glibc-doc",
"glibc-gconv-extra",
"glibc-doc", #ENGCMP-2354
"glibc-gconv-extra", #ENGCMP-2354
"liblockfile",
#"kmod-redhat-oracleasm",
]
}),
@ -1153,6 +1212,11 @@ additional_packages = [
"java-11-openjdk-*fastdebug*" #ENGCMP-2141
"dotnet5.0-build-reference-packages",
],
"s390x": [
# Slowdebug is only for Java 11 on s390x,
# according to RHELCMP-4189
"java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
],
}),
("^PowerTools$", {
"x86_64": [

2
common/multilib.conf
View File

@ -21,5 +21,7 @@ multilib_whitelist = {
"gcc-toolset-10-valgrind",
"gcc-toolset-11-valgrind",
"p11-kit-trust",
"glibc-gconv-extra",
"gcc-toolset-12-libgccjit",
],
}

10
rocky-packages.json
View File

@ -2992,9 +2992,6 @@
"libkkc-data": [
"libkkc-data.aarch64"
],
"liblockfile": [
"liblockfile.aarch64"
],
"liblognorm": [
"liblognorm-doc.aarch64",
"liblognorm.aarch64"
@ -9258,9 +9255,6 @@
"libloader": [
"libloader.noarch"
],
"liblockfile": [
"liblockfile.ppc64le"
],
"liblognorm": [
"liblognorm-doc.ppc64le",
"liblognorm.ppc64le"
@ -16288,10 +16282,6 @@
"libloader": [
"libloader.noarch"
],
"liblockfile": [
"liblockfile.i686",
"liblockfile.x86_64"
],
"liblognorm": [
"liblognorm-doc.x86_64",
"liblognorm.i686",

2
variants.xml
View File

@ -170,7 +170,9 @@
<module>mariadb:10.5</module>
<module>maven:3.5</module>
<module>maven:3.6</module>
<module>maven:3.8</module>
<module>mercurial:4.8</module>
<module>mercurial:6.2</module>
<module>mod_auth_openidc:2.3</module>
<module>mysql:8.0</module>
<module>nginx:1.14</module>