rpms/osbuild-composer
8
0
Fork 2
Code Issues Pull Requests Releases Activity

Add AlmaLinux support patch

Browse Source 
Add AlmaLinux-Kitten support patch
This commit is contained in:
Eduard Abdullin 2025-03-12 16:25:55 +03:00 committed by eabdullin
parent 5c4263b337
commit d911a63a57
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch
View File

@ -1,4 +1,4 @@
From cfebe25b2acb8074dd7cbef9a9abe10d66d2a679 Mon Sep 17 00:00:00 2001
From b3f1ee3733ad0684816ea8da5b0a99d32e42da18 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Thu, 26 Dec 2024 15:52:33 +0300
Subject: [PATCH 1/3] Remove libreport-rhel-anaconda-bugzilla from anaconda
@ -9,10 +9,10 @@ Subject: [PATCH 1/3] Remove libreport-rhel-anaconda-bugzilla from anaconda
1 file changed, 1 deletion(-)
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go
index 0d5fbe0..1fbbed3 100644
index e1703e8..167a14f 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go
@@ -228,7 +228,6 @@ func anacondaPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
@@ -229,7 +229,6 @@ func anacondaPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"libibverbs",
"libreport-plugin-bugzilla",
"libreport-plugin-reportuploader",

16
0002-Add-AlmaLinux-support.patch
View File

@ -1,4 +1,4 @@
From 325fe9af6b5e51faaaaf7751b371f8d6d5c6151e Mon Sep 17 00:00:00 2001
From a4f8aef386c8b862a474a337f20d1d34ee066a09 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Thu, 26 Dec 2024 15:53:32 +0300
Subject: [PATCH 2/3] Add AlmaLinux support
@ -49,13 +49,13 @@ 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 05ec7c1..4a6a65b 100644
index 5f2b0dd..dee3717 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.6",
"rhel-10": "rhel-10.0",
"rhel-9": "rhel-9.7",
"rhel-10": "rhel-10.1",
+ "almalinux-8": "almalinux-8.10",
+ "almalinux-9": "almalinux-9.5",
+ "almalinux-10": "almalinux-10.0",
@ -63,13 +63,13 @@ index 05ec7c1..4a6a65b 100644
LogLevel: "info",
LogFormat: "journal",
diff --git a/cmd/osbuild-composer/config_test.go b/cmd/osbuild-composer/config_test.go
index f26d1db..194573b 100644
index 8f22e9c..5e04d87 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.6",
"rhel-9": "rhel-9.7",
+ "almalinux-8": "almalinux-8.10",
+ "almalinux-9": "almalinux-9.5",
+ "almalinux-10": "almalinux-10.0",
@ -89,7 +89,7 @@ index f26d1db..194573b 100644
@@ -176,6 +182,9 @@ func TestConfigFromEnv(t *testing.T) {
"rhel-8": "rhel-8.9",
"rhel-9": "rhel-9.3",
"rhel-10": "rhel-10.0", // this value is from the default config
"rhel-10": "rhel-10.1", // this value is from the default config
+ "almalinux-8": "almalinux-8.10",
+ "almalinux-9": "almalinux-9.5",
+ "almalinux-10": "almalinux-10.0", // this value is from the default config
@ -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 b92c7b8..fd8d821 100644
index c20008a..b184182 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 {

4
0003-Add-AlmaLinux-Kitten-support.patch
View File

@ -1,4 +1,4 @@
From 335f081f4703bb6dda09b06a9d61b00a425bc031 Mon Sep 17 00:00:00 2001
From 90281c1b18c191d9f2c87e2615f46f45a2ccd38c Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
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 fd8d821..5a1bbff 100644
index b184182..873947f 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 {

2
osbuild-composer.spec
View File

@ -477,7 +477,7 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Fri Mar 07 2025 Eduard Abdullin <eabdullin@almalinux.org> - 135-1.alma.1
* Wed Mar 12 2025 Eduard Abdullin <eabdullin@almalinux.org> - 135-1.alma.1
- Add AlmaLinux support patch
- Add AlmaLinux-Kitten support patch