From bf9c2ae29fa9d517c0a6e7e02dae249a67ba2c0f Mon Sep 17 00:00:00 2001 From: nazunalika Date: Tue, 25 May 2021 19:29:37 -0700 Subject: [PATCH] update pungi configs --- container.conf | 2 +- images-cloud.conf | 34 ++--- include-excludes.conf | 271 +++++++++++++-------------------- r8.conf | 25 +-- upcoming/include-excludes.conf | 54 ++++++- variants.xml | 15 +- 6 files changed, 201 insertions(+), 200 deletions(-) diff --git a/container.conf b/container.conf index 54a0f15..3564a8b 100644 --- a/container.conf +++ b/container.conf @@ -88,7 +88,7 @@ image_build = { "factory-parameters": { "generate_icicle": False, "docker_cmd": '[ "/bin/bash" ]', - "docker_label": '{ "name": "rocky", "license": "GPLv2", "vendor": "The Rocky Project", "version": "8.0"}', + "docker_label": '{ "name": "rocky", "license": "BSD-3-Clause", "vendor": "The Rocky Project", "version": "8.0"}', } } ] diff --git a/images-cloud.conf b/images-cloud.conf index a5553a9..193960c 100644 --- a/images-cloud.conf +++ b/images-cloud.conf @@ -5,7 +5,7 @@ image_build = { "format": [("docker", "tar.gz")], "name": "Rocky-8-Container", "subvariant": "container", - "version": "8.3", + "version": "8.4", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-rocky-8", "ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#HEAD", @@ -16,15 +16,15 @@ image_build = { "arches": ["x86_64","ppc64le","aarch64"], "failable": ["ppc64le"], "repo": [ - "http://dl.rockylinux.org/pub/rocky/8.3/BaseOS/$arch/os/", - "http://dl.rockylinux.org/pub/rocky/8.3/AppStream/$arch/os/", + "http://dl.rockylinux.org/pub/rocky/8.4/BaseOS/$arch/os/", + "http://dl.rockylinux.org/pub/rocky/8.4/AppStream/$arch/os/", ], - "install_tree_from": "http://dl.rockylinux.org/pub/rocky/8.3/BaseOS/$arch/os/", + "install_tree_from": "http://dl.rockylinux.org/pub/rocky/8.4/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, "docker_cmd": '[ "/bin/bash" ]', - "docker_label": '{ "name": "rocky", "license": "GPLv2", "vendor": "The Rocky Project", "version": "8"}', + "docker_label": '{ "name": "rocky", "license": "BSD-3-Clause", "vendor": "The Rocky Project", "version": "8"}', } }, { @@ -32,7 +32,7 @@ image_build = { "format": [("qcow2", "qcow2")], "name": "Rocky-8-GenericCloud", "subvariant": "generic", - "version": "8.3", + "version": "8.4", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-rocky-8", "ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#HEAD", @@ -42,10 +42,10 @@ image_build = { "disk-size": "8", "arches": ["x86_64","ppc64le","aarch64"], "repo": [ - "http://dl.rockylinux.org/pub/rocky/8.3/BaseOS/$arch/os/", - "http://dl.rockylinux.org/pub/rocky/8.3/AppStream/$arch/os/", + "http://dl.rockylinux.org/pub/rocky/8.4/BaseOS/$arch/os/", + "http://dl.rockylinux.org/pub/rocky/8.4/AppStream/$arch/os/", ], - "install_tree_from": "http://dl.rockylinux.org/pub/rocky/8.3/BaseOS/$arch/os/", + "install_tree_from": "http://dl.rockylinux.org/pub/rocky/8.4/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, @@ -56,7 +56,7 @@ image_build = { "format": [("qcow2", "qcow2")], "name": "Rocky-8-ec2", "subvariant": "ec2", - "version": "8.3", + "version": "8.4", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-rocky-8", "ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#HEAD", @@ -66,10 +66,10 @@ image_build = { "disk-size": "8", "arches": ["x86_64", "aarch64"], "repo": [ - "http://dl.rockylinux.org/pub/rocky/8.3/BaseOS/$arch/os/", - "http://dl.rockylinux.org/pub/rocky/8.3/AppStream/$arch/os/", + "http://dl.rockylinux.org/pub/rocky/8.4/BaseOS/$arch/os/", + "http://dl.rockylinux.org/pub/rocky/8.4/AppStream/$arch/os/", ], - "install_tree_from": "http://dl.rockylinux.org/pub/rocky/8.3/BaseOS/$arch/os/", + "install_tree_from": "http://dl.rockylinux.org/pub/rocky/8.4/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, @@ -80,7 +80,7 @@ image_build = { "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')], "name": "Rocky-8-Vagrant", "subvariant": "vagrant", - "version": "8.3", + "version": "8.4", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-rocky-8", "ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#HEAD", @@ -90,10 +90,10 @@ image_build = { "disk-size": "8", "arches": ["x86_64"], "repo": [ - "http://dl.rockylinux.org/pub/rocky/8.3/BaseOS/$arch/os/", - "http://dl.rockylinux.org/pub/rocky/8.3/AppStream/$arch/os/", + "http://dl.rockylinux.org/pub/rocky/8.4/BaseOS/$arch/os/", + "http://dl.rockylinux.org/pub/rocky/8.4/AppStream/$arch/os/", ], - "install_tree_from": "http://dl.rockylinux.org/pub/rocky/8.3/BaseOS/$arch/os/", + "install_tree_from": "http://dl.rockylinux.org/pub/rocky/8.4/BaseOS/$arch/os/", "failable": ["ppc64le","aarch64"], }, "factory-parameters": { diff --git a/include-excludes.conf b/include-excludes.conf index 1a9b1dc..363f662 100644 --- a/include-excludes.conf +++ b/include-excludes.conf @@ -4,8 +4,11 @@ filter_packages = [ "python36", "gcc-toolset-9-*-testsuite", "gcc-toolset-9-gcc-plugin-devel", + "tuned-profiles-sap", # RCM-53604 - This should be only in SAP + "tuned-profiles-sap-hana", # RCM-53604 - This should be only in SAPHANA "java-*slowdebug*", "java-*fastdebug*", + "insights-client", ] }), @@ -17,147 +20,96 @@ filter_packages = [ "ongres-scram", ] }), + + ("^.*$", { + "*": [ + "java-11-openjdk-*slowdebug*", + ] + }), ] -filter_modules = [ - ("^AppStream$", { - "aarch64": - [ - "eclipse:rhel8", - ], - "ppc64le": - [ - "eclipse:rhel8", - ], - "s390x": [ - "eclipse:rhel8", - ] - }), -] +#filter_modules = [ +# ("^AppStream$", { +# "aarch64": +# [ +# "eclipse:rhel8", +# ], +# "ppc64le": +# [ +# "eclipse:rhel8", +# ], +# "s390x": [ +# "eclipse:rhel8", +# ] +# }), +#] additional_packages = [ ("^AppStream$", { "*": [ "libasan5", "libubsan1", - "spice-vdagent-win-x64", - "spice-vdagent-win-x86", - "usbguard-selinux", - "gcc-toolset-9-libasan-devel", - "gcc-toolset-9-libatomic-devel", - "gcc-toolset-9-liblsan-devel", - "gcc-toolset-9-libubsan-devel", - "gcc-toolset-9-libtsan-devel", - "gcc-toolset-10", - "gcc-toolset-10-binutils", - "gcc-toolset-10-dyninst", - "gcc-toolset-10-dyninst-devel", - "gcc-toolset-10-strace", - "gcc-toolset-10-gcc", - "gcc-toolset-10-gcc-gdb-plugin", - "gcc-toolset-10-libasan-devel", - "gcc-toolset-10-libatomic-devel", - "gcc-toolset-10-libitm-devel", - "gcc-toolset-10-liblsan-devel", - "gcc-toolset-10-libubsan-devel", - "gcc-toolset-10-libtsan-devel", - "gcc-toolset-10-libstdc++-docs", - "gcc-toolset-10-binutils-devel", - "gcc-toolset-10-build", - "gcc-toolset-10-elfutils-devel", - "gcc-toolset-10-elfutils-libelf-devel", - "gcc-toolset-10-gdb-doc", - "gcc-toolset-10-gdb-gdbserver", - "gcc-toolset-10-make-devel", - "gcc-toolset-10-systemtap-initscript", - "gcc-toolset-10-systemtap-sdt-devel", - "gcc-toolset-10-systemtap-server", - "gcc-toolset-10-valgrind-devel", - "ghostscript-x11", - "python3-libmount", - "itstool", - "js-d3-flame-graph", - "python3-wx-siplib", - "osbuild", - "osbuild-composer", - "osbuild-ostree", - "osbuild-selinux", - "python3-dasbus", - "NetworkManager-libreswan-gnome", - "bogofilter", - "cmake-gui", - "evince", - "evince-browser-plugin", - "evolution-bogofilter", - "evolution-mapi", - "evolution-pst", - "evolution-spamassassin", - "exempi", - "exiv2", - "gnome-backgrounds-extras", - "gnome-getting-started-docs-cs", - "gnome-getting-started-docs-de", - "gnome-getting-started-docs-es", - "gnome-getting-started-docs-fr", - "gnome-getting-started-docs-gl", - "gnome-getting-started-docs-hu", - "gnome-getting-started-docs-it", - "gnome-getting-started-docs-pl", - "gnome-getting-started-docs-pt_BR", - "gnome-getting-started-docs-ru", - "gnome-shell-extension-auto-move-windows", - "gnome-shell-extension-dash-to-dock", - "gnome-shell-extension-drive-menu", - "gnome-shell-extension-native-window-placement", - "gnome-shell-extension-no-hot-corner", - "gnome-shell-extension-panel-favorites", - "gnome-shell-extension-screenshot-window-sizer", - "gnome-shell-extension-systemMonitor", - "gnome-shell-extension-top-icons", - "gnome-shell-extension-updates-dialog", - "gnome-shell-extension-user-theme", - "gnome-shell-extension-windowsNavigator", - "gnome-shell-extension-workspace-indicator", + "dotnet5.0", + "gcc-toolset-10-dyninst-devel", "gnome-software-editor", - "gnome-tweaks", - "gstreamer1-plugins-good-gtk", - "highlight-gui", - "hplip-gui", - "hwloc-gui", - "java-11-openjdk-static-libs", - "libproxy-gnome", - "lshw-gui", - "mdevctl", - "mpg123-plugins-pulseaudio", - "pipewire-devel", "pipewire-docs", - "pipewire-utils", - "policycoreutils-gui", - "tuned-gtk", - "xmlsec1-nss", - "udisks2-lsm", - "annobin-annocheck", - "net-snmp-perl", - "pipewire0.2-devel", - "pipewire0.2-libs", - "usbguard-notifier", - "rsyslog-omamqp1", - "fapolicyd-selinux", - "thermald", - "python3-brotli", - "nmstate-plugin-ovsdb", - "git-lfs", - "tigervnc-server-module", - "greenboot", - "greenboot-grub2", - "greenboot-reboot", - "greenboot-rpm-ostree-grub2", - "greenboot-status", - "python3-libmodulemd", - "dotnet5.0", + "rt-tests", + "micropipenv", + "nispor", + "nispor-devel", + "osbuild-composer-core", + "python3-nispor", + "libnumbertext", + "dotnet-sdk-3.0", + "perl-IO-String", + "stalld", + "dejavu-lgc-sans-fonts", + "xorg-x11-drivers", + "fstrm", + "fstrm-devel", + "ucx-cma", + "ucx-ib", + "ucx-rdmacm" + "ucx-devel", + "qatengine", + "mpich-doc", + "mvapich2-devel", + "mvapich2-psm2-devel", + "mvapich2-doc", + "libecpg", + "rsyslog-udpspoof", + "mysql-selinux", + "rshim", + "qatlib", + "tracer", + "flatpak-xdg-utils", + "modulemd-tools", + "emoji-picker", + "rhc-worker-playbook", ] }), +# ("^Devel$", { +# "*": [ +# "*", +# ] +# }), + + ("^BaseOS$", { + "*": [ + "python3-debuginfo", + "python3-pyverbs", + "syslinux-tftpboot", + "samba-winexe", + "accel-config", + "ima-evm-utils0", + ] + }), + ("^BaseOS$", { + "x86_64": [ + "alsa-sof-firmware-debug", + ], + }), ("^Devel$", { "*": [ "argparse-manpage", @@ -180,50 +132,43 @@ additional_packages = [ ] }), - ("^PowerTools", { + ("^PowerTools$", { "*": [ - "opencv", + "libdnf-devel", + "librepo-devel", + "librhsm-devel", + "libsolv-devel", + "libsolv-tools", + "ibus-typing-booster-tests", + ] + }), + ("PowerTools", { + "aarch64": [ + "java-1.8.0-openjdk-*slowdebug*", + "java-11-openjdk-*slowdebug*", + ], + "ppc64le": [ + "java-1.8.0-openjdk-*slowdebug*", + "java-11-openjdk-*slowdebug*", + ], + "x86_64": [ + "java-1.8.0-openjdk-*slowdebug*", + "java-11-openjdk-*slowdebug*", + ], + }), + + ("PowerTools", { + "x86_64": [ + "java-1.8.0-openjdk-*fastdebug*", + "java-11-openjdk-*fastdebug*", ] }), - ("^AppStream$", { - "x86_64": [ - - "libreoffice-langpack-*", - "libreoffice-help-*", - ], - "aarch64": [ - "vulkan-loader", - "vulkan-loader-devel", - "vulkan-headers", - "vulkan-validation-layers", - "vulkan-tools", - ], - "armhfp": [ - "libreoffice-*", - "libreoffice-help-*", - "libreoffice-langpack-*", - "emacs-*", - "autocorr*", - "fence-agents*", - "gnome-shell-extension*", - "google-noto*", - "hunspell-*", - "hyphen-*", - ] - }), ("^BaseOS$", { "*": [ "rocky-obsolete-packages", - "sssd-polkit-rules", - "python3-debuginfo", - "python3-dnf-plugin-post-transaction-actions", - "python3-solv", - "libxmlb", - "crypto-policies-scripts", - "memstrack", ], "armhfp": [ "kernel-lpae*", diff --git a/r8.conf b/r8.conf index 2514450..309dfdd 100644 --- a/r8.conf +++ b/r8.conf @@ -6,14 +6,14 @@ from include-excludes import * release_name = "Rocky Linux" release_short = "Rocky" release_version = "8" -version = "8.3" +version = "8.4" # GENERAL SETTINGS comps_file = { 'scm': 'git', 'repo': 'https://git.rockylinux.org/rocky/comps.git', 'branch': 'main', - 'file': 'comps-rocky-8.3.xml', + 'file': 'comps-rocky-8.4.xml', } #link_type = 'hardlink-or-copy' @@ -22,7 +22,7 @@ link_type = 'copy' module_defaults_dir = { 'scm': 'git', 'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git', - 'branch': 'r8.3', + 'branch': 'r8.4', 'dir': '.', } @@ -81,7 +81,7 @@ createrepo_checksum = "sha256" createrepo_use_xz = True createrepo_num_threads = 8 createrepo_num_workers = 4 -createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.3'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.4'] # CHECKSUMS media_checksums = ['sha256'] @@ -109,12 +109,12 @@ buildinstall_skip = [ ] image_name_format = { - "^BaseOS$": "{release_short}-8.3-{arch}-{disc_type}{disc_num}{suffix}", - "^Minimal$": "{release_short}-8.3-{arch}-minimal{suffix}", - ".*": "{release_short}-8.3-{arch}-{disc_type}{disc_num}{suffix}", + "^BaseOS$": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}", + "^Minimal$": "{release_short}-8.4-{arch}-minimal{suffix}", + ".*": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}", } -image_volid_formats = [ '{release_short}-8.3-{arch}-{disc_type}', ] +image_volid_formats = [ '{release_short}-8.4-{arch}-{disc_type}', ] # CREATEISO create_optional_isos = False @@ -129,12 +129,12 @@ createiso_skip = [ extra_isos = { "BaseOS": [{ "include_variants": ["AppStream"], - "filename": "{release_short}-8.3-{arch}-{disc_type}{disc_num}{suffix}", + "filename": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}", "skip_src": True, }], "Minimal": [{ "include_variants": ["BaseOS"], - "filename": "{release_short}-8.3-{arch}-minimal{suffix}", + "filename": "{release_short}-8.4-{arch}-minimal{suffix}", "skip_src": True, }] } @@ -151,6 +151,10 @@ variant_as_lookaside = [ ('HighAvailability', 'AppStream'), ("ResilientStorage", "BaseOS"), ("ResilientStorage", "AppStream"), +# ("RT", "BaseOS"), +# ("RT", "AppStream"), +# ("NFV", "BaseOS"), +# ("NFV", "AppStream"), ] extra_files = [ @@ -164,6 +168,7 @@ extra_files = [ 'SOURCES/LICENSE', 'SOURCES/EULA', 'SOURCES/COMMUNITY-CHARTER', + 'SOURCES/RPM-GPG-KEY-rockyofficial', ], "target": "", }, diff --git a/upcoming/include-excludes.conf b/upcoming/include-excludes.conf index f96d7ba..363f662 100644 --- a/upcoming/include-excludes.conf +++ b/upcoming/include-excludes.conf @@ -3,6 +3,9 @@ filter_packages = [ "*": [ "python36", "gcc-toolset-9-*-testsuite", + "gcc-toolset-9-gcc-plugin-devel", + "tuned-profiles-sap", # RCM-53604 - This should be only in SAP + "tuned-profiles-sap-hana", # RCM-53604 - This should be only in SAPHANA "java-*slowdebug*", "java-*fastdebug*", "insights-client", @@ -18,6 +21,11 @@ filter_packages = [ ] }), + ("^.*$", { + "*": [ + "java-11-openjdk-*slowdebug*", + ] + }), ] #filter_modules = [ @@ -49,6 +57,7 @@ additional_packages = [ "micropipenv", "nispor", "nispor-devel", + "osbuild-composer-core", "python3-nispor", "libnumbertext", "dotnet-sdk-3.0", @@ -62,6 +71,7 @@ additional_packages = [ "ucx-ib", "ucx-rdmacm" "ucx-devel", + "qatengine", "mpich-doc", "mvapich2-devel", "mvapich2-psm2-devel", @@ -75,6 +85,7 @@ additional_packages = [ "flatpak-xdg-utils", "modulemd-tools", "emoji-picker", + "rhc-worker-playbook", ] }), @@ -96,11 +107,30 @@ additional_packages = [ }), ("^BaseOS$", { "x86_64": [ - # Keep alsa-sof-firmware synchronized with - # alsa-sof-firmware in the comps file "alsa-sof-firmware-debug", ], }), + ("^Devel$", { + "*": [ + "argparse-manpage", + "autogen-libopts-devel", + "gfbgraph-devel", + "jbig2dec-devel", + "liba52-devel", + "libavc1394-devel", + "libdvdnav-devel", + "libnml-devel", + "libss-devel", + "libssh2-devel", + "libuv-devel", + "mobile-broadband-provider-info-devel", + "openslp-devel", + "protobuf-lite-devel", + "quota-devel", + "rest-devel", + "tracker-devel", + ] + }), ("^PowerTools$", { "*": [ @@ -112,7 +142,6 @@ additional_packages = [ "ibus-typing-booster-tests", ] }), - ("PowerTools", { "aarch64": [ "java-1.8.0-openjdk-*slowdebug*", @@ -134,4 +163,23 @@ additional_packages = [ "java-11-openjdk-*fastdebug*", ] }), + + + + ("^BaseOS$", { + "*": [ + "rocky-obsolete-packages", + ], + "armhfp": [ + "kernel-lpae*", + "uboot-tools", + "uboot-images*", + "grub2*", + "grubby-deprecated", + "efibootmgr", + "cloud-utils-growpart", + "bcm283x-firmware", + "efivar*", + ] + }), ] diff --git a/variants.xml b/variants.xml index 6d3b6a8..c6969b3 100644 --- a/variants.xml +++ b/variants.xml @@ -156,8 +156,8 @@ perl-libwww-perl:6.34 container-tools:1.0 container-tools:2.0 + container-tools:3.0 container-tools:rhel8 - freeradius:3.0 gimp:2.8 go-toolset:rhel8 @@ -171,6 +171,7 @@ llvm-toolset:rhel8 mailman:2.1 mariadb:10.3 + mariadb:10.5 maven:3.5 maven:3.6 mercurial:4.8 @@ -192,13 +193,17 @@ php:7.4 pki-core:10.6 pki-deps:10.6 + pmdk:1-fileformat-v6 postgresql:10 postgresql:9.6 postgresql:12 + postgresql:13 python27:2.7 python36:3.6 python38:3.8 + python39:3.9 redis:5 + redis:6 rhn-tools:1.0 ruby:2.5 ruby:2.6 @@ -208,7 +213,9 @@ scala:2.10 squid:4 subversion:1.10 + subversion:1.14 swig:3.0 + swig:4.0 varnish:6 virt:rhel perl-YAML:1.24 @@ -241,16 +248,12 @@ rocky-powertools - javapackages-tools:201801 - mariadb-devel:10.3 virt-devel:rhel python38-devel:3.8 + python39-devel:3.9