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-03-30 14:50:28 +00:00 committed by root
commit 7ee4130244
5 changed files with 456 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/osbuild-composer-149.tar.gz
SOURCES/osbuild-composer-164.tar.gz

2
.osbuild-composer.metadata
View File

@ -1 +1 @@
ea59dc56a63899e6efb74dbc8b82ffa25012fbe3 SOURCES/osbuild-composer-149.tar.gz
17f78cbff0d6ced491a61fbf4bc9a96abe68120b SOURCES/osbuild-composer-164.tar.gz

379
SOURCES/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
SOURCES/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

38
SPECS/osbuild-composer.spec
View File

@ -8,11 +8,11 @@
%bcond_with relax_requires
# The minimum required osbuild version
%global min_osbuild_version 157
%global min_osbuild_version 171
%global goipath github.com/osbuild/osbuild-composer
Version: 149
Version: 164
%gometa
@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
}
Name: osbuild-composer
Release: 1%{?dist}.alma.1
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,6 +36,10 @@ License: Apache-2.0
URL: %{gourl}
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}
BuildRequires: systemd
@ -122,7 +126,6 @@ GOTAGS="${GOTAGS:+$GOTAGS,}rhel%{rhel}"
%endif
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-cli-tests %{goipath}/cmd/osbuild-composer-cli-tests
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tests %{goipath}/cmd/osbuild-auth-tests
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-koji-tests %{goipath}/cmd/osbuild-koji-tests
@ -224,7 +227,6 @@ install -m 0644 -vp docs/*.7 %{buildroot}%
install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer-test
install -m 0755 -vp _bin/osbuild-composer-cli-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-weldr-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-dnf-json-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-auth-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-koji-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-composer-dbjobqueue-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
@ -324,9 +326,6 @@ cd $PWD/_build/src/%{goipath}
%package core
Summary: The core osbuild-composer binary
Requires: osbuild-depsolve-dnf >= %{min_osbuild_version}
# This version needs to get bumped everytime the osbuild-depsolve-dnf json
# API changes in incompatible ways
Requires: osbuild-dnf-json-api = 8
Provides: %{name}-dnf-json = %{version}-%{release}
Obsoletes: %{name}-dnf-json < %{version}-%{release}
@ -451,9 +450,30 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Thu Sep 25 2025 Eduard Abdullin <eabdullin@almalinux.org> - 149-1.alma.1
* Mon Mar 30 2026 Eduard Abdullin <eabdullin@almalinux.org> - 164-1.alma.3
- Add AlmaLinux repositories
* Mon Feb 23 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 164-1
- New upstream release
* Tue Feb 17 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 163-1
- New upstream release
* Wed Feb 11 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 162-1
- New upstream release
* Wed Feb 04 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 161-1
- New upstream release
* Wed Jan 21 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 160-1
- New upstream release
* Wed Dec 24 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 158-1
- New upstream release
* Wed Nov 12 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 155-1
- New upstream release
* Thu Aug 21 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 149-1
- New upstream release