Merge pull request 'ALBS-498: kernel-modules-extra is absent on Minimal ISO images for both AlmaLinux and CloudLinux' (#1) from ALBS-498_a8.6 into a8.6

Reviewed-on: #1
This commit is contained in:
Stepan Oksanichenko 2022-08-04 08:19:11 +00:00
commit 6aef0df7a6
6 changed files with 30 additions and 15 deletions

View File

@ -1,6 +1,6 @@
filter_packages = [ filter_packages = [
( (
'^(BaseOS|AppStream|PowerTools)$', { '^(BaseOS|Minimal|AppStream|PowerTools)$', {
'aarch64': [ 'aarch64': [
"insights-client", "insights-client",
"libreport-plugin-rhtsupport", "libreport-plugin-rhtsupport",
@ -37,7 +37,7 @@ filter_packages = [
} }
), ),
( (
'^(BaseOS)$', { '^(BaseOS|Minimal)$', {
'aarch64': [ 'aarch64': [
"perl-Net-SSLeay", "perl-Net-SSLeay",
"perl-Mozilla-CA", "perl-Mozilla-CA",
@ -75,6 +75,13 @@ additional_packages = [
] ]
} }
), ),
(
'^Minimal$', {
'*': [
"kernel-modules-extra",
]
}
),
( (
'^ResilientStorage$', { '^ResilientStorage$', {
'*': [ '*': [

View File

@ -57,9 +57,7 @@
] ]
}, },
"Minimal": { "Minimal": {
"gather_methods": { "gather_methods": "hybrid",
"comps": "deps"
},
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
"buildinstall_skip": false, "buildinstall_skip": false,
"createiso_skip": true, "createiso_skip": true,

View File

@ -1,6 +1,6 @@
filter_packages = [ filter_packages = [
( (
'^(BaseOS|AppStream|PowerTools)$', { '^(BaseOS|Minimal|AppStream|PowerTools)$', {
'ppc64le': [ 'ppc64le': [
"insights-client", "insights-client",
"libreport-plugin-rhtsupport", "libreport-plugin-rhtsupport",
@ -39,7 +39,7 @@ filter_packages = [
} }
), ),
( (
'^(BaseOS)$', { '^(BaseOS|Minimal)$', {
'ppc64le': [ 'ppc64le': [
"perl-Net-SSLeay", "perl-Net-SSLeay",
"perl-Mozilla-CA", "perl-Mozilla-CA",
@ -68,6 +68,13 @@ additional_packages = [
] ]
} }
), ),
(
'^Minimal$', {
'*': [
"kernel-modules-extra",
]
}
),
( (
'^ResilientStorage$', { '^ResilientStorage$', {
'*': [ '*': [

View File

@ -57,9 +57,7 @@
] ]
}, },
"Minimal": { "Minimal": {
"gather_methods": { "gather_methods": "hybrid",
"comps": "deps"
},
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
"buildinstall_skip": false, "buildinstall_skip": false,
"createiso_skip": true, "createiso_skip": true,

View File

@ -1,6 +1,6 @@
filter_packages = [ filter_packages = [
( (
'^(BaseOS|AppStream|PowerTools)$', { '^(BaseOS|Minimal|AppStream|PowerTools)$', {
'x86_64': [ 'x86_64': [
"insights-client", "insights-client",
"libreport-plugin-rhtsupport", "libreport-plugin-rhtsupport",
@ -56,7 +56,7 @@ filter_packages = [
} }
), ),
( (
'^(BaseOS)$', { '^(BaseOS|Minimal)$', {
'x86_64': [ 'x86_64': [
"perl-Net-SSLeay", "perl-Net-SSLeay",
"perl-Mozilla-CA", "perl-Mozilla-CA",
@ -97,6 +97,13 @@ additional_packages = [
] ]
} }
), ),
(
'^Minimal$', {
'*': [
"kernel-modules-extra",
]
}
),
( (
'^HighAvailability$', { '^HighAvailability$', {
'*': [ '*': [

View File

@ -75,9 +75,7 @@
] ]
}, },
"Minimal": { "Minimal": {
"gather_methods": { "gather_methods": "hybrid",
"comps": "deps"
},
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
"buildinstall_skip": false, "buildinstall_skip": false,
"createiso_skip": true, "createiso_skip": true,