sig_core/pungi-rocky
7
0
Fork 0
mirror of https://git.rockylinux.org/rocky/pungi-rocky.git synced 2024-12-21 08:58:30 +00:00
Code Issues Projects Releases Wiki Activity

clean up for 8.8

Browse Source
This commit is contained in:
Louis Abel 2022-11-08 22:56:44 -07:00
parent 8f69c91ffa
commit a559dc1fd8
Signed by: label
GPG Key ID: B37E62D143879B36
25 changed files with 92 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

294
common/include-excludes.conf
View File

@ -23,21 +23,19 @@ filter_packages = [
"openldap-servers-debuginfo", # RCM-28225
"ongres-scram", # RCM-31750
"libcomps-devel", #RhBug 1960616
"fstrm-utils",
]
}),
# ("^RT$", {
# "*": [
# "kernel-rt-kvm-debuginfo", # RCM-33741
# "kernel-rt-debug-kvm-debuginfo", # RCM-33741
# ]
# }),
("^RT$", {
"*": [
"kernel-rt-kvm-debuginfo", # RCM-33741
"kernel-rt-debug-kvm-debuginfo", # RCM-33741
]
}),
("^.*$", {
"*": [
"scap-security-guide-rule-playbooks",
"kernel-ml"
"scap-security-guide-rule-playbooks"
]
}),
]
@ -61,15 +59,15 @@ filter_modules = [
additional_packages = [
("^AppStream$", {
"*": [
"ansible-collection-redhat-rhel_mgmt", #RHELCMP-6300 RhBug 1992497
"ansible-collection-redhat-rhel_mgmt",
"aspnetcore-runtime-7.0",
"aspnetcore-targeting-pack-7.0",
"bind9.16", #ENGCMP-1675
"bind9.16-chroot", #ENGCMP-1675
"bind9.16-utils", #ENGCMP-1675
"bind9.16-libs", #ENGCMP-1675
"bind9.16-license", #ENGCMP-1675
"cockpit-leapp", #ENGCMP-1819
"bind9.16",
"bind9.16-chroot",
"bind9.16-utils",
"bind9.16-libs",
"bind9.16-license",
"cockpit-leapp",
"dotnet",
"dotnet-apphost-pack-7.0",
"dotnet-host",
@ -80,43 +78,29 @@ additional_packages = [
"dotnet-templates-7.0",
"egl-utils",
"frr-selinux",
"libasan5", #RCM-61474
"inkscape1",
"inkscape1-docs",
"inkscape1-view",
"jigawatts-javadoc",
"libasan5",
"libsndfile-utils",
"libubsan1",
"libwpe",
"gnome-software-editor",
"pipewire-docs",
"gcc-toolset-11-annobin-annocheck-debuginfo", #RHELCMP-5799
"gcc-toolset-11-annobin-debuginfo", #RHELCMP-5799
"gcc-toolset-11-annobin-plugin-gcc-debuginfo", #RHELCMP-5799
"gcc-toolset-11-annobin-debuginfo", #RHELCMP-5799
"gcc-toolset-11-gcc-gdb-plugin-debuginfo", #RHELCMP-5799
"gcc-toolset-11-systemtap-server-debuginfo", #RHELCMP-5799
"gcc-toolset-12", #ENGCMP-2287
"gcc-toolset-12-annobin-annocheck", #ENGCMP-2383
"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
"leapp", # RHBug: 2017461, Jira: RHELCMP-7153
"leapp-repository", # RHELCMP-7154
"prometheus-jmx-exporter-openjdk8",
"prometheus-jmx-exporter-openjdk17",
"python3-scour",
"gcc-toolset-11-annobin-annocheck-debuginfo",
"gcc-toolset-11-annobin-debuginfo",
"gcc-toolset-11-annobin-plugin-gcc-debuginfo",
"gcc-toolset-11-annobin-debuginfo",
"gcc-toolset-11-gcc-gdb-plugin-debuginfo",
"gcc-toolset-11-systemtap-server-debuginfo",
"virt-v2v",
"swtpm",
"libtpms",
"netstandard-targeting-pack-2.1",
"grafana-azure-monitor",
"grafana-cloudwatch",
"grafana-elasticsearch",
@ -129,126 +113,80 @@ additional_packages = [
"grafana-postgres",
"grafana-prometheus",
"grafana-stackdriver",
"php-pecl-xdebug3", #ENGCMP-1718
"fdo-admin-cli", #ENGCMP-1993
"fdo-init", #ENGCMP-1717
"fdo-client", #ENGCMP-1717
"fdo-manufacturing-server", #ENGCMP-1843
"fdo-owner-cli", #ENGCMP-1717
"fdo-owner-onboarding-server",#ENGCMP-1843
"fdo-rendezvous-server", #ENGCMP-1843
"ansible-core", #ENGCMP-1722
"ansible-test",
"osbuild-lvm2", #ENGCMP-1731
"osbuild-luks2",
"hostapd", # ENGCMP-1720
"gnome-shell-extension-classification-banner", #ENGCMP-1770
"gnome-shell-extension-dash-to-panel", #ENGCMP-1770
"gnome-shell-extension-gesture-inhibitor", #ENGCMP-1770
"autocorr-en", #ENGCMP-1797
"libabw", #ENGCMP-1847
"libasan8",
"libcdr", #ENGCMP-1847
"libcmis", #ENGCMP-1797
"libexttextcat", #ENGCMP-1797
"libfreehand", #ENGCMP-1847
"libmspub", #ENGCMP-1847
"libmwaw", #ENGCMP-1847
"liborcus", #ENGCMP-1797
"libpagemaker", #ENGCMP-1847
"libqxp", #ENGCMP-1847
"libreoffice-calc", #ENGCMP-1847
"libreoffice-core", #ENGCMP-1797
"libreoffice-data", #ENGCMP-1797
"libreoffice-graphicfilter", #ENGCMP-1847
"libreoffice-help-en", #ENGCMP-1797
"libreoffice-impress", #ENGCMP-1847
"libreoffice-langpack-en", #ENGCMP-1797
"libreoffice-ogltrans", #ENGCMP-1847
"libreoffice-opensymbol-fonts", #ENGCMP-1797
"libreoffice-pdfimport", #ENGCMP-1847
"libreoffice-pyuno", #ENGCMP-1847
"libreoffice-ure", #ENGCMP-1797
"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", #ENGCMP-2030
"fence-agents-kubevirt", #ENGCMP-2002
"fence-virtd-cpg", #ENGCMP-1972
"poppler-qt5", #ENGCMP-2393
"python3-dnf-plugin-modulesync", #ENGCMP-2018
"python3-lasso", #ENGCMP-2278
"php-pecl-xdebug3",
"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",
"snactor",
"libzdnn", #ENGCMP-2057
"make43",
"make43-devel",
"tuned-profiles-postgresql", #ENGCMP-2126
"ipxe-bootimgs-aarch64", #ENGCMP-2123
"ipxe-bootimgs-x86", #ENGCMP-2123
"spirv-tools", #ENGCMP-2316
"sssd-idp", #ENGCMP-2310
"vulkan-headers", #ENGCMP-2316
"vulkan-loader", #ENGCMP-2316
"vulkan-loader-devel", #ENGCMP-2316
"vulkan-tools", #ENGCMP-2316
"vulkan-validation-layers", #ENGCMP-2316
"wpebackend-fdo",
"xmlstarlet",
"xxhash",
"xxhash-libs",
"yara", #ENGCMP-2352
]
}),
("^AppStream$", {
"aarch64": [],
"ppc64le": [],
"x86_64": [
"open-vm-tools-salt-minion", #ENGCMP-2295
],
"x86_64": [],
"s390x": [],
}),
("^BaseOS$", {
"*": [
"python3-debuginfo", # RCM-73713
"compat-hwloc1", #RhBug 1979150
"NetworkManager-initscripts-updown", #ENGCMP-1991
"shadow-utils-subid", #ENGCMP-1597
"glibc-doc", #ENGCMP-2354
"glibc-gconv-extra", #ENGCMP-2354
"liblockfile",
"kmod-redhat-oracleasm",
]
}),
("^PowerTools$", {
"*": [
"sblim-gather-provider", #RHBug 1959078, RHELCMP-6212
"java-17-openjdk-*fastdebug*", #ENGCMP-2141
"java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
"tesseract-devel", # RHELCMP-5762
"shadow-utils-subid-devel", #ENGCMP-1597
"libdnf-devel",
"librepo-devel",
"librhsm-devel",
"libsolv-devel",
"libsolv-tools",
"ibus-typing-booster-tests", # RHELCMP-4254
"dotnet-sdk-3.1-source-built-artifacts",
"dotnet-sdk-5.0-source-built-artifacts",
"libcomps-devel", #RhBug 1960616
"fstrm-utils", #RhBug 1960616
]
}),
("^PowerTools$", {
"aarch64": [
"java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
"java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
"java-1.8.0-openjdk-*fastdebug*", #ENGCMP-2141
"java-11-openjdk-*fastdebug*" #ENGCMP-2141
],
"ppc64le": [
"java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
"java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
"java-1.8.0-openjdk-*fastdebug*", #ENGCMP-2141
"java-11-openjdk-*fastdebug*" #ENGCMP-2141
],
"x86_64": [
"java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
"java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
"java-1.8.0-openjdk-*fastdebug*", #ENGCMP-2141
"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": [
"java-1.8.0-openjdk-*fastdebug*", # Jira: RHELCMP-4189
"java-11-openjdk-*fastdebug*", # Jira: RHELCMP-4189
]
}),
("^devel$", {
"*": [
"libxmlb-devel",
@ -1174,58 +1112,6 @@ additional_packages = [
]
}),
("^PowerTools$", {
"*": [
"sblim-gather-provider", #RHBug 1959078, RHELCMP-6212
"java-17-openjdk-*fastdebug*", #ENGCMP-2141
"java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
"tesseract-devel", # RHELCMP-5762
"shadow-utils-subid-devel", #ENGCMP-1597
"libdnf-devel",
"librepo-devel",
"librhsm-devel",
"libsolv-devel",
"libsolv-tools",
"ibus-typing-booster-tests", # RHELCMP-4254
"dotnet-sdk-3.1-source-built-artifacts",
"dotnet-sdk-5.0-source-built-artifacts",
"libcomps-devel", #RhBug 1960616
]
}),
("^PowerTools$", {
"aarch64": [
"java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
"java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
"java-1.8.0-openjdk-*fastdebug*", #ENGCMP-2141
"java-11-openjdk-*fastdebug*" #ENGCMP-2141
],
"ppc64le": [
"java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
"java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
"java-1.8.0-openjdk-*fastdebug*", #ENGCMP-2141
"java-11-openjdk-*fastdebug*" #ENGCMP-2141
],
"x86_64": [
"java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
"java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
"java-1.8.0-openjdk-*fastdebug*", #ENGCMP-2141
"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": [
"java-1.8.0-openjdk-*fastdebug*", # Jira: RHELCMP-4189
"java-11-openjdk-*fastdebug*", # Jira: RHELCMP-4189
]
}),
# Consolidation
('^plus$', {
'*': [

2
generate-prepop-yaml
View File

@ -1,2 +1,2 @@
#!/bin/bash
python3 -c 'import sys, yaml, json; print(yaml.dump(json.loads(sys.stdin.read())))' < rocky-packages.json > rocky-packages.yaml
python3 -c 'import sys, yaml, json; print(yaml.dump(json.loads(sys.stdin.read())))' < prepopulate.json > prepopulate.yaml

0
advanced-virt.conf → legacy/advanced-virt.conf
View File

0
gluster9.conf → legacy/gluster9.conf
View File

0
nfv.conf → legacy/nfv.conf
View File

0
r8-armhfp.conf → legacy/r8-armhfp.conf
View File

0
r8-i686-devel.conf → legacy/r8-i686-devel.conf
View File

0
r8-i686-updates.conf → legacy/r8-i686-updates.conf
View File

0
r8-i686.conf → legacy/r8-i686.conf
View File

0
rocky-armhfp-packages.json → legacy/rocky-armhfp-packages.json
View File

0
rocky-i686-packages.json → legacy/rocky-i686-packages.json
View File

0
variants-advanced-virt.xml → legacy/variants-advanced-virt.xml
View File

0
variants-armhfp.xml → legacy/variants-armhfp.xml
View File

0
variants-cloud.xml → legacy/variants-cloud.xml
View File

0
variants-extras.xml → legacy/variants-extras.xml
View File

0
variants-gluster9.xml → legacy/variants-gluster9.xml
View File

0
variants-i686-devel.xml → legacy/variants-i686-devel.xml
View File

0
variants-i686.xml → legacy/variants-i686.xml
View File

0
variants-kernel.xml → legacy/variants-kernel.xml
View File

0
variants-kmod.xml → legacy/variants-kmod.xml
View File

0
variants-nfv.xml → legacy/variants-nfv.xml
View File

0
variants-plus.xml → legacy/variants-plus.xml
View File

0
variants-rockyrpi.xml → legacy/variants-rockyrpi.xml
View File

18
rocky-packages.yaml → prepopulate.yaml
View File

@ -1809,8 +1809,6 @@ AppStream:
initial-setup:
- initial-setup-gui.aarch64
- initial-setup.aarch64
insights-client:
- insights-client.noarch
intltool:
- intltool.noarch
iperf3:
@ -3787,10 +3785,6 @@ AppStream:
- redhat-support-tool.noarch
rest:
- rest.aarch64
rhc:
- rhc.aarch64
rhc-worker-playbook:
- rhc-worker-playbook.aarch64
rhel-system-roles:
- rhel-system-roles.noarch
rig:
@ -6570,8 +6564,6 @@ AppStream:
initial-setup:
- initial-setup-gui.ppc64le
- initial-setup.ppc64le
insights-client:
- insights-client.noarch
intltool:
- intltool.noarch
iperf3:
@ -8728,10 +8720,6 @@ AppStream:
- redland.ppc64le
rest:
- rest.ppc64le
rhc:
- rhc.ppc64le
rhc-worker-playbook:
- rhc-worker-playbook.ppc64le
rhel-system-roles:
- rhel-system-roles.noarch
rhythmbox:
@ -11899,8 +11887,6 @@ AppStream:
initial-setup:
- initial-setup-gui.x86_64
- initial-setup.x86_64
insights-client:
- insights-client.noarch
intltool:
- intltool.noarch
iperf3:
@ -14704,10 +14690,6 @@ AppStream:
rest:
- rest.i686
- rest.x86_64
rhc:
- rhc.x86_64
rhc-worker-playbook:
- rhc-worker-playbook.x86_64
rhel-system-roles:
- rhel-system-roles.noarch
rhythmbox:

1
variants.xml
View File

@ -208,6 +208,7 @@
<module>postgresql:10</module>
<module>postgresql:12</module>
<module>postgresql:13</module>
<module>postgresql:15</module>
<module>postgresql:9.6</module>
<module>python27:2.7</module>
<module>python36:3.6</module>