diff --git a/aarch64/variants_options.json b/aarch64/variants_options.json index 4e28a1e..c662799 100644 --- a/aarch64/variants_options.json +++ b/aarch64/variants_options.json @@ -12,7 +12,7 @@ "skip_src": true, "extra_files": [{ "scm": "git", - "repo": "https://git.almalinux.org/rpms/almalinux-release.git", + "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git", "branch": "a{{ distribution_major_version }}s", "file": [ "LICENSE", @@ -68,7 +68,7 @@ "skip_src": true, "extra_files": [{ "scm": "git", - "repo": "https://git.almalinux.org/rpms/almalinux-release.git", + "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git", "branch": "a{{ distribution_major_version }}s", "file": [ "LICENSE", diff --git a/ppc64le/include_exclude.conf b/ppc64le/include_exclude.conf new file mode 100644 index 0000000..589b76e --- /dev/null +++ b/ppc64le/include_exclude.conf @@ -0,0 +1,130 @@ +filter_packages = [ + ( + '^(BaseOS|Minimal|AppStream|CRB)$', { + 'ppc64le': [ + "insights-client", + "libreport-plugin-rhtsupport", + "libreport-rhel", + "libreport-rhel-anaconda-bugzilla", + "libreport-rhel-bugzilla", + "redhat-backgrounds", + "redhat-logos", + "redhat-logos-httpd", + "redhat-logos-ipa", + "redhat-release-eula", + "redhat-support-lib-python", + "redhat-support-tool", + "spice-client-win-x64", + "spice-client-win-x86", + "spice-qxl-wddm-dod", + "spice-vdagent-win-x64", + "spice-vdagent-win-x86", + "virt-who", + "virtio-win", + "subscription-manager-cockpit", + "subscription-manager-initial-setup-addon", + "rhsm-gtk", + "rhsm-icons", + "rhc", + "rhc-worker-playbook", + "python2-gluster*", + "greenboot-grub2", + "greenboot-reboot", + "greenboot-rpm-ostree-grub2", + "greenboot-status", + "qemu-kvm-hw-usbredir", + "subscription-manager-rhsm-certificates.ppc64le", + ] + } + ), + ( + '^(BaseOS|Minimal)$', { + 'ppc64le': [ + "perl-Net-SSLeay", + "perl-Mozilla-CA", + "perl-IO-Socket-SSL", + ] + } + ), + ( + '^(AppStream)$', { + 'ppc64le': [ + "java-1.8.0-openjdk-slowdebug", + "java-1.8.0-openjdk-headless-slowdebug", + "sos", + ] + } + ), +] +filter_modules = [] + +additional_packages = [ + ( + '^AppStream$', { + '*': [ + "almalinux-backgrounds", + "keylime-selinux", + "lorax-templates-almalinux", + ] + } + ), + ( + '^CRB$', { + '*': [ + "xorg-x11-server-source", + ] + } + ), + ( + '^Minimal$', { + '*': [ + "aide", + "audispd-plugins", + "audit", + "chrony", + "crypto-policies", + "dnf-automatic", + "fapolicyd", + "firewalld", + "gnutls-utils", + "kernel-modules-extra", + "libreswan", + "libselinux", + "libsss_sudo", + "opensc", + "openscap", + "openscap-scanner", + "openssh-clients", + "openssh-server", + "openssl-pkcs11", + "pcsc-lite", + "policycoreutils", + "policycoreutils-python-utils", + "python3-libselinux", + "rear", + "rng-tools", + "rsyslog", + "rsyslog-gnutls", + "scap-security-guide", + "subscription-manager", + "sudo", + "tmux", + "usbguard", + "kernel", + "libsss_autofs", + "sssd-nfs-idmap", + "glibc-gconv-extra", + "kbd-legacy", + "container-selinux", + ] + } + ), + ( + '^extras$', { + '*': [ + "anaconda-live", + ] + } + ) +] + diff --git a/ppc64le/multilib.conf b/ppc64le/multilib.conf new file mode 100644 index 0000000..2326c1b --- /dev/null +++ b/ppc64le/multilib.conf @@ -0,0 +1,3 @@ +multilib_blacklist = {} +multilib_whitelist = {} +multilib = [] \ No newline at end of file diff --git a/ppc64le/variants_options.json b/ppc64le/variants_options.json new file mode 100644 index 0000000..c662799 --- /dev/null +++ b/ppc64le/variants_options.json @@ -0,0 +1,81 @@ +{ + "BaseOS": { + "gather_methods": "hybrid", + "buildinstall_skip": false, + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", + "createiso_skip": true, + "extra_isos": [{ + "include_variants": [ + "AppStream" + ], + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", + "skip_src": true, + "extra_files": [{ + "scm": "git", + "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git", + "branch": "a{{ distribution_major_version }}s", + "file": [ + "LICENSE", + "EULA", + "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}" + ] + }] + }] + }, + "AppStream": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS" + ] + }, + "CRB": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream" + ] + }, + "HighAvailability": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream" + ] + }, + "ResilientStorage": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream" + ] + }, + "Minimal": { + "gather_methods": "hybrid", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "buildinstall_skip": false, + "createiso_skip": true, + "extra_isos": [{ + "include_variants": [], + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "skip_src": true, + "extra_files": [{ + "scm": "git", + "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git", + "branch": "a{{ distribution_major_version }}s", + "file": [ + "LICENSE", + "EULA", + "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}" + ] + }] + }] + } +} \ No newline at end of file diff --git a/pungi-build.conf.j2 b/pungi-build.conf.j2 index 0ff5d2b..cea335f 100644 --- a/pungi-build.conf.j2 +++ b/pungi-build.conf.j2 @@ -190,7 +190,7 @@ extra_files = [ '*': [ { "scm": "git", - "repo": "https://git.almalinux.org/rpms/almalinux-release.git", + "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git", "branch": "a{{ distribution_major_version }}s", "file": [ 'LICENSE', diff --git a/s390x/include_exclude.conf b/s390x/include_exclude.conf new file mode 100644 index 0000000..afaec38 --- /dev/null +++ b/s390x/include_exclude.conf @@ -0,0 +1,150 @@ +filter_packages = [ + ( + '^(BaseOS|Minimal|AppStream|CRB)$', { + 's390x': [ + "insights-client", + "libreport-plugin-rhtsupport", + "libreport-rhel", + "libreport-rhel-anaconda-bugzilla", + "libreport-rhel-bugzilla", + "redhat-backgrounds", + "redhat-logos", + "redhat-logos-httpd", + "redhat-logos-ipa", + "redhat-release-eula", + "redhat-support-lib-python", + "redhat-support-tool", + "spice-client-win-x64", + "spice-client-win-x86", + "spice-qxl-wddm-dod", + "spice-vdagent-win-x64", + "spice-vdagent-win-x86", + "virt-who", + "virtio-win", + "subscription-manager-cockpit", + "subscription-manager-initial-setup-addon", + "rhsm-gtk", + "rhsm-icons", + "rhc", + "rhc-worker-playbook", + "python2-gluster*", + "greenboot-grub2", + "greenboot-reboot", + "greenboot-rpm-ostree-grub2", + "greenboot-status", + "qemu-kvm-hw-usbredir", + "pcp-pmda-bpf", + "subscription-manager-rhsm-certificates.s390x", + ] + } + ), + ( + '^(BaseOS)$', { + 's390x': [ + "perl-Net-SSLeay", + "perl-Mozilla-CA", + "perl-IO-Socket-SSL", + ] + } + ), + ( + '^(AppStream)$', { + 's390x': [ + "java-1.8.0-openjdk-slowdebug", + "java-1.8.0-openjdk-headless-slowdebug", + "sos", + ] + } + ), + ( + '^(extras)$', { + '*': [ + "centos-release-*", + "centos-release-cloud.noarch", + "centos-release-ovirt45-testing.noarch", + "centos-release-openstack-yoga.noarch", + ] + } + ) +] +filter_modules = [] + +additional_packages = [ + ( + '^AppStream$', { + '*': [ + "almalinux-backgrounds", + "aspnetcore-runtime-7.0", + "aspnetcore-targeting-pack-7.0", + "dotnet-apphost-pack-7.0", + "dotnet-hostfxr-7.0", + "dotnet-runtime-7.0", + "dotnet-sdk-7.0", + "dotnet-targeting-pack-7.0", + "dotnet-templates-7.0", + "keylime-selinux", + "lorax-templates-almalinux", + ] + } + ), + ( + '^CRB$', { + '*': [ + "dotnet-sdk-7.0-source-built-artifacts", + "xorg-x11-server-source", + ] + } + ), + ( + '^Minimal$', { + '*': [ + "aide", + "audispd-plugins", + "audit", + "chrony", + "crypto-policies", + "dnf-automatic", + "fapolicyd", + "firewalld", + "gnutls-utils", + "kernel-modules-extra", + "libreswan", + "libselinux", + "libsss_sudo", + "opensc", + "openscap", + "openscap-scanner", + "openssh-clients", + "openssh-server", + "openssl-pkcs11", + "pcsc-lite", + "policycoreutils", + "policycoreutils-python-utils", + "python3-libselinux", + "rear", + "rng-tools", + "rsyslog", + "rsyslog-gnutls", + "scap-security-guide", + "subscription-manager", + "sudo", + "tmux", + "usbguard", + "kernel", + "libsss_autofs", + "sssd-nfs-idmap", + "glibc-gconv-extra", + "kbd-legacy", + "container-selinux", + ] + } + ), + ( + '^extras$', { + '*': [ + "anaconda-live", + ] + } + ) +] + diff --git a/s390x/multilib.conf b/s390x/multilib.conf new file mode 100644 index 0000000..2326c1b --- /dev/null +++ b/s390x/multilib.conf @@ -0,0 +1,3 @@ +multilib_blacklist = {} +multilib_whitelist = {} +multilib = [] \ No newline at end of file diff --git a/s390x/variants_options.json b/s390x/variants_options.json new file mode 100644 index 0000000..8f94d48 --- /dev/null +++ b/s390x/variants_options.json @@ -0,0 +1,127 @@ +{ + "BaseOS": { + "gather_methods": "hybrid", + "buildinstall_skip": false, + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", + "createiso_skip": true, + "extra_isos": [{ + "include_variants": [ + "AppStream" + ], + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", + "skip_src": true, + "extra_files": [{ + "scm": "git", + "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git", + "branch": "a{{ distribution_major_version }}s", + "file": [ + "LICENSE", + "EULA", + "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}" + ] + }] + }] + }, + "AppStream": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS" + ] + }, + "CRB": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream" + ] + }, + "HighAvailability": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream" + ] + }, + "ResilientStorage": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream" + ] + }, + "extras": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream" + ] + }, + "SAPHANA": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream", + "HighAvailability" + ] + }, + "SAP": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream", + "HighAvailability" + ] + }, + "Minimal": { + "gather_methods": "hybrid", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "buildinstall_skip": false, + "createiso_skip": true, + "extra_isos": [{ + "include_variants": [], + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "skip_src": true, + "extra_files": [{ + "scm": "git", + "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git", + "branch": "a{{ distribution_major_version }}s", + "file": [ + "LICENSE", + "EULA", + "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}" + ] + }] + }] + }, + "devel": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream", + "CRB", + "SAP", + "SAPHANA", + "extras", + "Minimal", + "ResilientStorage", + "HighAvailability" + ] + } +} + diff --git a/x86_64/variants_options.json b/x86_64/variants_options.json index 4f6fb44..a078abf 100644 --- a/x86_64/variants_options.json +++ b/x86_64/variants_options.json @@ -12,7 +12,7 @@ "skip_src": true, "extra_files": [{ "scm": "git", - "repo": "https://git.almalinux.org/rpms/almalinux-release.git", + "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git", "branch": "a{{ distribution_major_version }}s", "file": [ "LICENSE", @@ -86,7 +86,7 @@ "skip_src": true, "extra_files": [{ "scm": "git", - "repo": "https://git.almalinux.org/rpms/almalinux-release.git", + "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git", "branch": "a{{ distribution_major_version }}s", "file": [ "LICENSE", diff --git a/x86_64_v2/include_exclude.conf b/x86_64_v2/include_exclude.conf new file mode 100644 index 0000000..47471d2 --- /dev/null +++ b/x86_64_v2/include_exclude.conf @@ -0,0 +1,121 @@ +filter_packages = [ + ( + '^(BaseOS|Minimal|AppStream|CRB)$', { + 'x86_64': [ + "insights-client", + "libreport-plugin-rhtsupport", + "libreport-rhel", + "libreport-rhel-anaconda-bugzilla", + "libreport-rhel-bugzilla", + "redhat-backgrounds", + "redhat-logos", + "redhat-logos-httpd", + "redhat-logos-ipa", + "redhat-release-eula", + "redhat-support-lib-python", + "redhat-support-tool", + "spice-client-win-x64", + "spice-client-win-x86", + "spice-qxl-wddm-dod", + "virt-who", + "virtio-win", + "subscription-manager-cockpit", + "subscription-manager-initial-setup-addon", + "rhsm-gtk", + "rhsm-icons", + "rhc", + "rhc-worker-playbook", + "python2-gluster*", + "greenboot-grub2", + "greenboot-reboot", + "greenboot-rpm-ostree-grub2", + "greenboot-status", + "qemu-kvm-hw-usbredir", + "subscription-manager-rhsm-certificates.x86_64", + "kernel-rt-core.x86_64", + "kernel-rt-modules-core.x86_64", + ] + } + ), + ( + '^(BaseOS|Minimal)$', { + 'x86_64': [ + "perl-Mozilla-CA", + "perl-IO-Socket-SSL", + "python-unversioned-command", + ] + } + ), + ( + '^(AppStream)$', { + 'x86_64': [ + "java-1.8.0-openjdk-slowdebug", + "java-1.8.0-openjdk-headless-slowdebug", + "sos", + ] + } + ), +] +filter_modules = [] + +additional_packages = [ + ( + '^AppStream$', { + '*': [ + "almalinux-backgrounds", + "lorax-templates-almalinux", + ] + } + ), + ( + '^Minimal$', { + '*': [ + "aide", + "audispd-plugins", + "audit", + "chrony", + "crypto-policies", + "dnf-automatic", + "fapolicyd", + "firewalld", + "gnutls-utils", + "kernel-modules-extra", + "libreswan", + "libselinux", + "libsss_sudo", + "opensc", + "openscap", + "openscap-scanner", + "openssh-clients", + "openssh-server", + "openssl-pkcs11", + "pcsc-lite", + "policycoreutils", + "policycoreutils-python-utils", + "python3-libselinux", + "rear", + "rng-tools", + "rsyslog", + "rsyslog-gnutls", + "scap-security-guide", + "subscription-manager", + "sudo", + "tmux", + "usbguard", + "kernel", + "libsss_autofs", + "sssd-nfs-idmap", + "glibc-gconv-extra", + "kbd-legacy", + "container-selinux", + ] + } + ), + ( + '^extras$', { + '*': [ + "anaconda-live", + ] + } + ) +] diff --git a/x86_64_v2/multilib.conf b/x86_64_v2/multilib.conf new file mode 100644 index 0000000..2326c1b --- /dev/null +++ b/x86_64_v2/multilib.conf @@ -0,0 +1,3 @@ +multilib_blacklist = {} +multilib_whitelist = {} +multilib = [] \ No newline at end of file diff --git a/x86_64_v2/variants_options.json b/x86_64_v2/variants_options.json new file mode 100644 index 0000000..a078abf --- /dev/null +++ b/x86_64_v2/variants_options.json @@ -0,0 +1,99 @@ +{ + "BaseOS": { + "gather_methods": "hybrid", + "buildinstall_skip": false, + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", + "createiso_skip": true, + "extra_isos": [{ + "include_variants": [ + "AppStream" + ], + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", + "skip_src": true, + "extra_files": [{ + "scm": "git", + "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git", + "branch": "a{{ distribution_major_version }}s", + "file": [ + "LICENSE", + "EULA", + "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}" + ] + }] + }] + }, + "AppStream": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS" + ] + }, + "CRB": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream" + ] + }, + "HighAvailability": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream" + ] + }, + "ResilientStorage": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream" + ] + }, + "RT": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream" + ] + }, + "NFV": { + "gather_methods": "hybrid", + "buildinstall_skip": true, + "createiso_skip": true, + "variant_as_lookaside": [ + "BaseOS", + "AppStream" + ] + }, + "Minimal": { + "gather_methods": "hybrid", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "buildinstall_skip": false, + "createiso_skip": true, + "extra_isos": [{ + "include_variants": [], + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "skip_src": true, + "extra_files": [{ + "scm": "git", + "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git", + "branch": "a{{ distribution_major_version }}s", + "file": [ + "LICENSE", + "EULA", + "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}" + ] + }] + }] + } +} \ No newline at end of file