Add AlmaLinux support patch
Add AlmaLinux-Kitten support patch
This commit is contained in:
Eduard Abdullin
parent
5b068126e9
commit
b6bdaa92b1
@ -1,7 +1,7 @@
|
||||
From 7674af39a9b345c15fb15dc5396e45abaab90465 Mon Sep 17 00:00:00 2001
|
||||
From: eabdullin <eabdullin@almalinux.org>
|
||||
Date: Thu, 26 Dec 2024 15:52:33 +0300
|
||||
Subject: [PATCH 1/2] Remove libreport-rhel-anaconda-bugzilla from anaconda
|
||||
Subject: [PATCH 1/3] Remove libreport-rhel-anaconda-bugzilla from anaconda
|
||||
packageset
|
||||
|
||||
---
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 5c1f96c82817c9d865dbf69d0496e55105c1897e Mon Sep 17 00:00:00 2001
|
||||
From a31a0a5dc407a0ae8a0f6ee0d3906117e2b8750a Mon Sep 17 00:00:00 2001
|
||||
From: eabdullin <eabdullin@almalinux.org>
|
||||
Date: Thu, 26 Dec 2024 15:53:32 +0300
|
||||
Subject: [PATCH 2/2] Add AlmaLinux support
|
||||
Subject: [PATCH 2/3] Add AlmaLinux support
|
||||
|
||||
---
|
||||
cmd/osbuild-composer/config.go | 3 +
|
||||
@ -25,12 +25,13 @@ Subject: [PATCH 2/2] Add AlmaLinux support
|
||||
repositories/almalinux-9.5.json | 66 +++++++++++++++++++
|
||||
repositories/almalinux-9.6.json | 66 +++++++++++++++++++
|
||||
repositories/almalinux-9.json | 66 +++++++++++++++++++
|
||||
.../osbuild/images/pkg/distro/defs/loader.go | 3 +
|
||||
.../images/pkg/distro/rhel/distribution.go | 19 ++++++
|
||||
.../images/pkg/distro/rhel/imagetype.go | 4 ++
|
||||
.../images/pkg/distro/rhel/rhel10/distro.go | 8 ++-
|
||||
.../images/pkg/distro/rhel/rhel8/distro.go | 13 ++--
|
||||
.../images/pkg/distro/rhel/rhel9/distro.go | 12 ++--
|
||||
26 files changed, 1200 insertions(+), 10 deletions(-)
|
||||
27 files changed, 1203 insertions(+), 10 deletions(-)
|
||||
create mode 100644 repositories/almalinux-10.0.json
|
||||
create mode 100644 repositories/almalinux-10.json
|
||||
create mode 100644 repositories/almalinux-8.10.json
|
||||
@ -1356,6 +1357,27 @@ index 0000000..eab76bf
|
||||
+ }
|
||||
+ ]
|
||||
+}
|
||||
diff --git a/vendor/github.com/osbuild/images/pkg/distro/defs/loader.go b/vendor/github.com/osbuild/images/pkg/distro/defs/loader.go
|
||||
index 142cb30..6638138 100644
|
||||
--- a/vendor/github.com/osbuild/images/pkg/distro/defs/loader.go
|
||||
+++ b/vendor/github.com/osbuild/images/pkg/distro/defs/loader.go
|
||||
@@ -68,6 +68,7 @@ func PackageSet(it distro.ImageType, overrideTypeName string, replacements map[s
|
||||
distroName := distroNameVer[:strings.LastIndex(distroNameVer, "-")]
|
||||
distroVersion := strings.SplitN(distroNameVer, "-", 2)[1]
|
||||
distroNameMajorVer := strings.SplitN(distroNameVer, ".", 2)[0]
|
||||
+ distroMajorVer := strings.SplitN(distroVersion, ".", 2)[0]
|
||||
|
||||
// XXX: this is a short term measure, pass a set of
|
||||
// searchPaths down the stack instead
|
||||
@@ -85,6 +86,8 @@ func PackageSet(it distro.ImageType, overrideTypeName string, replacements map[s
|
||||
case "rhel":
|
||||
// rhel yaml files are under ./rhel-$majorVer
|
||||
baseDir = distroNameMajorVer
|
||||
+ case "almalinux":
|
||||
+ baseDir = fmt.Sprintf("rhel-%s", distroMajorVer)
|
||||
case "centos":
|
||||
// centos yaml is just rhel but we have (sadly) no symlinks
|
||||
// in "go:embed" so we have to have this slightly ugly
|
||||
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go
|
||||
index 963aed0..8ad6354 100644
|
||||
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
From 90281c1b18c191d9f2c87e2615f46f45a2ccd38c Mon Sep 17 00:00:00 2001
|
||||
From b0b3da4737021c8a3ff471f113e729dde5cd69cd 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
|
||||
|
||||
---
|
||||
repositories/kitten-10.json | 66 +++++++++++++++++++
|
||||
.../osbuild/images/pkg/distro/defs/loader.go | 2 +-
|
||||
.../osbuild/images/pkg/distro/host.go | 23 +++++++
|
||||
.../images/pkg/distro/rhel/distribution.go | 19 ++++++
|
||||
.../images/pkg/distro/rhel/imagetype.go | 4 ++
|
||||
.../images/pkg/distro/rhel/rhel10/distro.go | 33 ++++++++++
|
||||
.../images/pkg/distrofactory/distrofactory.go | 1 +
|
||||
.../images/pkg/distroidparser/idparser.go | 1 +
|
||||
7 files changed, 147 insertions(+)
|
||||
8 files changed, 148 insertions(+), 1 deletion(-)
|
||||
create mode 100644 repositories/kitten-10.json
|
||||
|
||||
diff --git a/repositories/kitten-10.json b/repositories/kitten-10.json
|
||||
@ -86,6 +87,19 @@ index 0000000..674b9e5
|
||||
+ }
|
||||
+ ]
|
||||
+}
|
||||
diff --git a/vendor/github.com/osbuild/images/pkg/distro/defs/loader.go b/vendor/github.com/osbuild/images/pkg/distro/defs/loader.go
|
||||
index 6638138..bb243ab 100644
|
||||
--- a/vendor/github.com/osbuild/images/pkg/distro/defs/loader.go
|
||||
+++ b/vendor/github.com/osbuild/images/pkg/distro/defs/loader.go
|
||||
@@ -88,7 +88,7 @@ func PackageSet(it distro.ImageType, overrideTypeName string, replacements map[s
|
||||
baseDir = distroNameMajorVer
|
||||
case "almalinux":
|
||||
baseDir = fmt.Sprintf("rhel-%s", distroMajorVer)
|
||||
- case "centos":
|
||||
+ case "centos", "almalinux_kitten", "kitten":
|
||||
// centos yaml is just rhel but we have (sadly) no symlinks
|
||||
// in "go:embed" so we have to have this slightly ugly
|
||||
// workaround
|
||||
diff --git a/vendor/github.com/osbuild/images/pkg/distro/host.go b/vendor/github.com/osbuild/images/pkg/distro/host.go
|
||||
index 88d1da0..cc408c1 100644
|
||||
--- a/vendor/github.com/osbuild/images/pkg/distro/host.go
|
||||
@ -165,10 +179,10 @@ 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 b184182..873947f 100644
|
||||
index 9fc3ff8..66e60eb 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 {
|
||||
@@ -138,6 +138,10 @@ func (t *ImageType) IsAlma() bool {
|
||||
return t.arch.distro.IsAlma()
|
||||
}
|
||||
|
||||
@ -180,7 +194,7 @@ index b184182..873947f 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 b0d89f1..1f40678 100644
|
||||
index 86dc59d..225c369 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 {
|
||||
@ -197,7 +211,7 @@ index b0d89f1..1f40678 100644
|
||||
} else if t.IsAlma() {
|
||||
osVer := strings.Split(t.Arch().Distro().OsVersion(), ".")
|
||||
return fmt.Sprintf(ALMA_ISO_LABEL, osVer[0], osVer[1], t.Arch().Name())
|
||||
@@ -296,6 +299,28 @@ func ParseID(idStr string) (*distro.ID, error) {
|
||||
@@ -297,6 +300,28 @@ func ParseID(idStr string) (*distro.ID, error) {
|
||||
return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion)
|
||||
}
|
||||
|
||||
@ -226,7 +240,7 @@ index b0d89f1..1f40678 100644
|
||||
return id, nil
|
||||
}
|
||||
|
||||
@@ -307,3 +332,11 @@ func DistroFactory(idStr string) distro.Distro {
|
||||
@@ -308,3 +333,11 @@ func DistroFactory(idStr string) distro.Distro {
|
||||
|
||||
return newDistro(id.Name, 10, id.MinorVersion)
|
||||
}
|
||||
|
||||
@ -468,7 +468,7 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Apr 15 2025 Eduard Abdullin <eabdullin@almalinux.org> - 137-1.alma.1
|
||||
* Thu Apr 17 2025 Eduard Abdullin <eabdullin@almalinux.org> - 137-1.alma.1
|
||||
- Add AlmaLinux support patch
|
||||
- Add AlmaLinux-Kitten support patch
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user