From e8891521334c2f6da9ec5416a1f324b3cb9aa211 Mon Sep 17 00:00:00 2001 From: soksanichenko Date: Wed, 3 Aug 2022 11:39:22 +0300 Subject: [PATCH 1/2] ALBS-498: kernel-modules-extra is absent on Minimal ISO images for both AlmaLinux and CloudLinux - Additional package `kernel-modules-extra` for variant `Minimal` - gather method for variant `Minimal` is changed from `comps: deps` to `hybrid` --- aarch64/include_exclude.conf | 7 +++++++ aarch64/variants_options.json | 4 +--- ppc64le/include_exclude.conf | 7 +++++++ ppc64le/variants_options.json | 4 +--- s390x/include_exclude.conf | 7 +++++++ s390x/variants_options.json | 4 +--- x86_64/include_exclude.conf | 11 +++++++++-- x86_64/variants_options.json | 4 +--- 8 files changed, 34 insertions(+), 14 deletions(-) diff --git a/aarch64/include_exclude.conf b/aarch64/include_exclude.conf index b594781..d3d62c8 100644 --- a/aarch64/include_exclude.conf +++ b/aarch64/include_exclude.conf @@ -73,6 +73,13 @@ additional_packages = [ ] } ), + ( + '^Minimal$', { + '*': [ + "kernel-modules-extra", + ] + } + ), ( '^extras$', { '*': [ diff --git a/aarch64/variants_options.json b/aarch64/variants_options.json index 014658f..0d345b5 100644 --- a/aarch64/variants_options.json +++ b/aarch64/variants_options.json @@ -77,9 +77,7 @@ ] }, "Minimal": { - "gather_methods": { - "comps": "deps" - }, + "gather_methods": "hybrid", "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, diff --git a/ppc64le/include_exclude.conf b/ppc64le/include_exclude.conf index aacc705..174465f 100644 --- a/ppc64le/include_exclude.conf +++ b/ppc64le/include_exclude.conf @@ -72,6 +72,13 @@ additional_packages = [ ] } ), + ( + '^Minimal$', { + '*': [ + "kernel-modules-extra", + ] + } + ), ( '^extras$', { '*': [ diff --git a/ppc64le/variants_options.json b/ppc64le/variants_options.json index 014658f..0d345b5 100644 --- a/ppc64le/variants_options.json +++ b/ppc64le/variants_options.json @@ -77,9 +77,7 @@ ] }, "Minimal": { - "gather_methods": { - "comps": "deps" - }, + "gather_methods": "hybrid", "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, diff --git a/s390x/include_exclude.conf b/s390x/include_exclude.conf index 9931a04..6238dfd 100644 --- a/s390x/include_exclude.conf +++ b/s390x/include_exclude.conf @@ -73,6 +73,13 @@ additional_packages = [ ] } ), + ( + '^Minimal$', { + '*': [ + "kernel-modules-extra", + ] + } + ), ( '^extras$', { '*': [ diff --git a/s390x/variants_options.json b/s390x/variants_options.json index 014658f..0d345b5 100644 --- a/s390x/variants_options.json +++ b/s390x/variants_options.json @@ -77,9 +77,7 @@ ] }, "Minimal": { - "gather_methods": { - "comps": "deps" - }, + "gather_methods": "hybrid", "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, diff --git a/x86_64/include_exclude.conf b/x86_64/include_exclude.conf index 952f379..5ba7681 100644 --- a/x86_64/include_exclude.conf +++ b/x86_64/include_exclude.conf @@ -1,6 +1,6 @@ filter_packages = [ ( - '^(BaseOS|AppStream|CRB)$', { + '^(BaseOS|Minimal|AppStream|CRB)$', { 'x86_64': [ "insights-client", "libreport-plugin-rhtsupport", @@ -48,7 +48,7 @@ filter_packages = [ } ), ( - '^(BaseOS)$', { + '^(BaseOS|Minimal)$', { 'x86_64': [ "perl-Net-SSLeay", "perl-Mozilla-CA", @@ -86,6 +86,13 @@ additional_packages = [ ] } ), + ( + '^Minimal$', { + '*': [ + "kernel-modules-extra", + ] + } + ), ( '^extras$', { '*': [ diff --git a/x86_64/variants_options.json b/x86_64/variants_options.json index 3f8118b..81c031b 100644 --- a/x86_64/variants_options.json +++ b/x86_64/variants_options.json @@ -95,9 +95,7 @@ ] }, "Minimal": { - "gather_methods": { - "comps": "deps" - }, + "gather_methods": "hybrid", "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, -- 2.40.1 From 7b6ef20c7d6800109267550ca11d5793236f266f Mon Sep 17 00:00:00 2001 From: soksanichenko Date: Wed, 3 Aug 2022 11:45:25 +0300 Subject: [PATCH 2/2] ALBS-498: kernel-modules-extra is absent on Minimal ISO images for both AlmaLinux and CloudLinux - Additional package `kernel-modules-extra` for variant `Minimal` - gather method for variant `Minimal` is changed from `comps: deps` to `hybrid` --- aarch64/include_exclude.conf | 4 ++-- ppc64le/include_exclude.conf | 4 ++-- s390x/include_exclude.conf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aarch64/include_exclude.conf b/aarch64/include_exclude.conf index d3d62c8..14d7210 100644 --- a/aarch64/include_exclude.conf +++ b/aarch64/include_exclude.conf @@ -1,6 +1,6 @@ filter_packages = [ ( - '^(BaseOS|AppStream|CRB)$', { + '^(BaseOS|Minimal|AppStream|CRB)$', { 'aarch64': [ "insights-client", "libreport-plugin-rhtsupport", @@ -37,7 +37,7 @@ filter_packages = [ } ), ( - '^(BaseOS)$', { + '^(BaseOS|Minimal)$', { 'aarch64': [ "perl-Net-SSLeay", "perl-Mozilla-CA", diff --git a/ppc64le/include_exclude.conf b/ppc64le/include_exclude.conf index 174465f..50696db 100644 --- a/ppc64le/include_exclude.conf +++ b/ppc64le/include_exclude.conf @@ -1,6 +1,6 @@ filter_packages = [ ( - '^(BaseOS|AppStream|CRB)$', { + '^(BaseOS|Minimal|AppStream|CRB)$', { 'ppc64le': [ "insights-client", "libreport-plugin-rhtsupport", @@ -37,7 +37,7 @@ filter_packages = [ } ), ( - '^(BaseOS)$', { + '^(BaseOS|Minimal)$', { 'ppc64le': [ "perl-Net-SSLeay", "perl-Mozilla-CA", diff --git a/s390x/include_exclude.conf b/s390x/include_exclude.conf index 6238dfd..8184627 100644 --- a/s390x/include_exclude.conf +++ b/s390x/include_exclude.conf @@ -1,6 +1,6 @@ filter_packages = [ ( - '^(BaseOS|AppStream|CRB)$', { + '^(BaseOS|Minimal|AppStream|CRB)$', { 's390x': [ "insights-client", "libreport-plugin-rhtsupport", @@ -38,7 +38,7 @@ filter_packages = [ } ), ( - '^(BaseOS)$', { + '^(BaseOS|Minimal)$', { 's390x': [ "perl-Net-SSLeay", "perl-Mozilla-CA", -- 2.40.1