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

Add AlmaLinux repositories

Browse Source
This commit is contained in:
Eduard Abdullin 2026-04-21 13:40:27 +00:00 committed by root
parent 4049c8e13f
commit 74b5a6b104
5 changed files with 447 additions and 1518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

379
0001-Backport-https-github.com-osbuild-images-pull-1926.patch Normal file
View File

File diff suppressed because one or more lines are too long

46
0001-Bring-AlmaLinux-9-and-AlmaLinux-8-to-distros-back.patch Normal file
View File

@ -0,0 +1,46 @@
From db14fa981a84d23b9851d1112d941409124ed868 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
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"
+
- &centos9
<<: *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"
+
- &centos8
<<: *rhel8
name: centos-8
--
2.51.0

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

@ -1,25 +0,0 @@
From a4d0c12c3cfd50b3020a3b4fc142645ac7010387 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 1 Oct 2024 09:18:38 +0300
Subject: [PATCH 1/2] Remove libreport-rhel-anaconda-bugzilla from anaconda
packageset
---
.../osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go | 1 -
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
--- 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 {
"libibverbs",
"libreport-plugin-bugzilla",
"libreport-plugin-reportuploader",
- "libreport-rhel-anaconda-bugzilla",
"librsvg2",
"linux-firmware",
"lklug-fonts",
--
2.39.5 (Apple Git-154)

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

File diff suppressed because one or more lines are too long

48
osbuild-composer.spec
View File

@ -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
@ -36,8 +36,10 @@ License: Apache-2.0
URL: %{gourl}
Source0: %{gosource}
Patch101: 0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch
Patch102: 0002-Add-AlmaLinux-support.patch
# 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}
BuildRequires: systemd
@ -156,23 +158,22 @@ install -m 0755 -vp _bin/osbuild-jobsite-builder %{buildroot}%
# Only include repositories for the distribution and release
install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories
%if 0%{?almalinux}
%if 0%{?almalinux} >= 10
install -m 0644 -vp repositories/almalinux-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%else
install -m 0644 -vp repositories/almalinux-8* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%if 0%{?almalinux} == 9
install -m 0644 -vp repositories/almalinux-9* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%endif
%endif
%else
# CentOS also defines rhel so we check for centos first
%if 0%{?almalinux}
# AL10 support all AL versions
%if 0%{?almalinux} >= 10
install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/almalinux* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%else
# AL8 supports in AL9 and AL8
install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/almalinux-8* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%if 0%{?rhel} == 9
install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/almalinux-9* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%endif
%endif
%else
# Check for CentOS
%if 0%{?centos}
# Latest CentOS supports building all CentOS versions
@ -472,13 +473,8 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Thu Dec 26 2024 Eduard Abdullin <eabdullin@almalinux.org> - 118-1.alma.2
- Update key for AlmaLinux 10
* Tue Oct 01 2024 Eduard Abdullin <eabdullin@almalinux.org> - 118-1.alma.1
- Install AlmaLinux repositories
- Add AlmaLinux support patch (Thanks @pastalian)
- Remove libreport-rhel-bugzilla from package set
* Tue Apr 21 2026 Eduard Abdullin <eabdullin@almalinux.org> - 118-1.alma.3
- Add AlmaLinux repositories
* Fri Aug 23 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 118-1
- New upstream release