From 4d23f512c97d52c87c6ab8ada6d17f65c263b045 Mon Sep 17 00:00:00 2001 From: Eduard Abdullin Date: Wed, 22 Jul 2026 09:51:51 +0000 Subject: [PATCH] Add AlmaLinux repositories Add AlmaLinux and AlmaLinux Kitten x86_64_v2 support --- ...y-serve-x86_64_v2-RPMs-on-AlmaLinux-10-x8.patch | 14 +++++++------- osbuild-composer.spec | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/0001-reporegistry-serve-x86_64_v2-RPMs-on-AlmaLinux-10-x8.patch b/0001-reporegistry-serve-x86_64_v2-RPMs-on-AlmaLinux-10-x8.patch index 9df6142..e7a8b6b 100644 --- a/0001-reporegistry-serve-x86_64_v2-RPMs-on-AlmaLinux-10-x8.patch +++ b/0001-reporegistry-serve-x86_64_v2-RPMs-on-AlmaLinux-10-x8.patch @@ -63,13 +63,13 @@ passes with the upstream SKIP-on-v2 guard removed. Signed-off-by: Eduard Abdullin --- - .../images/pkg/reporegistry/reporegistry.go | 53 +++++++++++++++++++ + .../image-builder/pkg/reporegistry/reporegistry.go | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) -diff --git a/vendor/github.com/osbuild/images/pkg/reporegistry/reporegistry.go b/vendor/github.com/osbuild/images/pkg/reporegistry/reporegistry.go -index da083b9..35142e2 100644 ---- a/vendor/github.com/osbuild/images/pkg/reporegistry/reporegistry.go -+++ b/vendor/github.com/osbuild/images/pkg/reporegistry/reporegistry.go +diff --git a/vendor/github.com/osbuild/image-builder/pkg/reporegistry/reporegistry.go b/vendor/github.com/osbuild/image-builder/pkg/reporegistry/reporegistry.go +index 5076a45..a089332 100644 +--- a/vendor/github.com/osbuild/image-builder/pkg/reporegistry/reporegistry.go ++++ b/vendor/github.com/osbuild/image-builder/pkg/reporegistry/reporegistry.go @@ -4,6 +4,9 @@ import ( "errors" "fmt" @@ -78,8 +78,8 @@ index da083b9..35142e2 100644 + "runtime" + "strings" - "github.com/osbuild/images/pkg/distroidparser" - "github.com/osbuild/images/pkg/rpmmd" + "github.com/osbuild/image-builder/pkg/distroidparser" + "github.com/osbuild/image-builder/pkg/rpmmd" @@ -99,6 +102,52 @@ func (r *RepoRegistry) ReposByArchName(distro, arch string, includeTagged bool) return repositories, nil } diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 12a65de..4ccb72c 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients. } Name: osbuild-composer -Release: 1%{?dist}.alma.2 +Release: 1%{?dist}.alma.3 Summary: An image building service based on osbuild # osbuild-composer doesn't have support for building i686 and armv7hl images @@ -469,7 +469,7 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Wed Jul 15 2026 Eduard Abdullin - 176-1.alma.2 +* Wed Jul 22 2026 Eduard Abdullin - 176-1.alma.3 - Add AlmaLinux repositories - Add AlmaLinux and AlmaLinux Kitten x86_64_v2 support