From eb04a786f2b17155d911a91e930cd2b21e1d0eaf Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 19 Feb 2025 15:20:03 +0300 Subject: [PATCH] Update for the osbuild-composer 132 --- ...eport-rhel-anaconda-bugzilla-from-anacond.patch | 2 +- files/0002-Add-AlmaLinux-support.patch | 14 +++++++------- files/0003-Add-AlmaLinux-Kitten-support.patch | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/files/0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch b/files/0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch index ffbb1bc..1afb3e8 100644 --- a/files/0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch +++ b/files/0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch @@ -1,4 +1,4 @@ -From d81f35f5cd7758d642749154469101a4782bbd11 Mon Sep 17 00:00:00 2001 +From cfebe25b2acb8074dd7cbef9a9abe10d66d2a679 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 26 Dec 2024 15:52:33 +0300 Subject: [PATCH 1/3] Remove libreport-rhel-anaconda-bugzilla from anaconda diff --git a/files/0002-Add-AlmaLinux-support.patch b/files/0002-Add-AlmaLinux-support.patch index c3d01a5..4a96c03 100644 --- a/files/0002-Add-AlmaLinux-support.patch +++ b/files/0002-Add-AlmaLinux-support.patch @@ -1,4 +1,4 @@ -From 26c4aea0229869459684b30ca7937c80f38ddb4f Mon Sep 17 00:00:00 2001 +From 325fe9af6b5e51faaaaf7751b371f8d6d5c6151e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 26 Dec 2024 15:53:32 +0300 Subject: [PATCH 2/3] Add AlmaLinux support @@ -49,12 +49,12 @@ Subject: [PATCH 2/3] Add AlmaLinux support create mode 100644 repositories/almalinux-9.json diff --git a/cmd/osbuild-composer/config.go b/cmd/osbuild-composer/config.go -index e62be65..32bdf93 100644 +index 05ec7c1..4a6a65b 100644 --- a/cmd/osbuild-composer/config.go +++ b/cmd/osbuild-composer/config.go @@ -129,6 +129,9 @@ func GetDefaultConfig() *ComposerConfigFile { "rhel-8": "rhel-8.10", - "rhel-9": "rhel-9.5", + "rhel-9": "rhel-9.6", "rhel-10": "rhel-10.0", + "almalinux-8": "almalinux-8.10", + "almalinux-9": "almalinux-9.5", @@ -63,13 +63,13 @@ index e62be65..32bdf93 100644 LogLevel: "info", LogFormat: "journal", diff --git a/cmd/osbuild-composer/config_test.go b/cmd/osbuild-composer/config_test.go -index 2e7e999..bb8f7f6 100644 +index f26d1db..194573b 100644 --- a/cmd/osbuild-composer/config_test.go +++ b/cmd/osbuild-composer/config_test.go @@ -74,6 +74,9 @@ func TestDefaultConfig(t *testing.T) { "rhel-7": "rhel-7.9", "rhel-8": "rhel-8.10", - "rhel-9": "rhel-9.5", + "rhel-9": "rhel-9.6", + "almalinux-8": "almalinux-8.10", + "almalinux-9": "almalinux-9.5", + "almalinux-10": "almalinux-10.0", @@ -1320,7 +1320,7 @@ index 963aed0..8ad6354 100644 return nil, fmt.Errorf("unknown distro name: %s", name) } diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go -index b01cc45..8a808c3 100644 +index b92c7b8..fd8d821 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go @@ -132,6 +132,10 @@ func (t *ImageType) IsRHEL() bool { @@ -1335,7 +1335,7 @@ index b01cc45..8a808c3 100644 if !t.BootISO { return "", fmt.Errorf("image type %q is not an ISO", t.name) diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go -index a5cd9b9..4cd0ab0 100644 +index 618d61d..b0d89f1 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go @@ -40,10 +40,14 @@ var ( diff --git a/files/0003-Add-AlmaLinux-Kitten-support.patch b/files/0003-Add-AlmaLinux-Kitten-support.patch index badd272..3202ab4 100644 --- a/files/0003-Add-AlmaLinux-Kitten-support.patch +++ b/files/0003-Add-AlmaLinux-Kitten-support.patch @@ -1,4 +1,4 @@ -From 7927ad225b1ce4affa3b86c1172b768a2ded0000 Mon Sep 17 00:00:00 2001 +From 335f081f4703bb6dda09b06a9d61b00a425bc031 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 26 Dec 2024 15:57:00 +0300 Subject: [PATCH 3/3] Add AlmaLinux Kitten support @@ -165,7 +165,7 @@ index 8ad6354..3ef61c9 100644 if minor == -1 { return nil, errors.New("AlmaLinux requires a minor version") diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go -index 8a808c3..5be0f0e 100644 +index fd8d821..5a1bbff 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go @@ -136,6 +136,10 @@ func (t *ImageType) IsAlma() bool { @@ -180,7 +180,7 @@ index 8a808c3..5be0f0e 100644 if !t.BootISO { return "", fmt.Errorf("image type %q is not an ISO", t.name) diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go -index 4cd0ab0..1fd99de 100644 +index b0d89f1..1f40678 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go @@ -41,10 +41,13 @@ func distroISOLabelFunc(t *rhel.ImageType) string {