From 667efcc7a838385caf65c73e7cb53a97fb6543ef Mon Sep 17 00:00:00 2001 From: Eduard Abdullin Date: Fri, 14 Nov 2025 08:03:18 +0000 Subject: [PATCH] Add AlmaLinux repositories --- ...ux-9-and-AlmaLinux-8-to-distros-back.patch | 46 +++++++++++++++++++ osbuild-composer.spec | 5 +- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 0001-Bring-AlmaLinux-9-and-AlmaLinux-8-to-distros-back.patch diff --git a/0001-Bring-AlmaLinux-9-and-AlmaLinux-8-to-distros-back.patch b/0001-Bring-AlmaLinux-9-and-AlmaLinux-8-to-distros-back.patch new file mode 100644 index 0000000..24523b6 --- /dev/null +++ b/0001-Bring-AlmaLinux-9-and-AlmaLinux-8-to-distros-back.patch @@ -0,0 +1,46 @@ +From db14fa981a84d23b9851d1112d941409124ed868 Mon Sep 17 00:00:00 2001 +From: eabdullin +Date: Fri, 14 Nov 2025 10:25:12 +0300 +Subject: [PATCH] Bring AlmaLinux-9 and AlmaLinux-8 to distros back + +--- + .../osbuild/images/data/distrodefs/distros.yaml | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml +index f1d3dab..ff91232 100644 +--- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml ++++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml +@@ -236,6 +236,14 @@ distros: + ppc64le: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest" + s390x: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest" + ++ - <<: *rhel9 ++ name: "almalinux-{{.MajorVersion}}.{{.MinorVersion}}" ++ match: 'almalinux-9\.[0-9]{1,2}' ++ product: "AlmaLinux" ++ vendor: "almalinux" ++ ostree_ref_tmpl: "almalinux/9/%%s/edge" ++ iso_label_tmpl: "AlmaLinux-{{.Distro.MajorVersion}}-{{.Distro.MinorVersion}}-{{.Arch}}-dvd" ++ + - ¢os9 + <<: *rhel9 + name: centos-9 +@@ -325,6 +333,14 @@ distros: + ppc64le: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest" + s390x: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest" + ++ - <<: *rhel8 ++ name: "almalinux-{{.MajorVersion}}.{{.MinorVersion}}" ++ match: 'almalinux-8\.[0-9]{1,2}' ++ product: "AlmaLinux" ++ vendor: "almalinux" ++ ostree_ref_tmpl: "almalinux/8/%%s/edge" ++ iso_label_tmpl: "AlmaLinux-{{.Distro.MajorVersion}}-{{.Distro.MinorVersion}}-{{.Arch}}-dvd" ++ + - ¢os8 + <<: *rhel8 + name: centos-8 +-- +2.51.0 + diff --git a/osbuild-composer.spec b/osbuild-composer.spec index ce206dd..4448876 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 @@ -38,6 +38,7 @@ Source0: %{gosource} # AlmaLinux Patch Patch1: 0001-Backport-https-github.com-osbuild-images-pull-1926.patch +Patch2: 0001-Bring-AlmaLinux-9-and-AlmaLinux-8-to-distros-back.patch BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} @@ -454,7 +455,7 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Thu Nov 13 2025 Eduard Abdullin - 149-1.alma.2 +* Fri Nov 14 2025 Eduard Abdullin - 149-1.alma.3 - Add AlmaLinux repositories * Thu Aug 21 2025 imagebuilder-bot - 149-1