Compare commits

...

15 Commits
c8 ... a8

Author SHA1 Message Date
Eduard Abdullin
dc972d355a Install AlmaLinux repositories
Add AlmaLinux support
2025-06-30 07:33:47 +00:00
Eduard Abdullin
63d3983f2f Install AlmaLinux repositories
Add AlmaLinux support
2025-05-19 11:25:08 +00:00
14c601c2bf Bump release 2024-09-27 09:01:39 +03:00
5fb19fa473 Merge branch 'c8' into a8 2024-05-22 16:42:53 +03:00
fc1f93cd8d - Remove libreport-rhel-bugzilla from package set 2024-02-07 15:19:28 +03:00
7c7b1657c8 - Sync with stable
- Add new key for AlmaLinux8
2024-02-07 11:36:03 +03:00
dbe32ebfec Update debrand patch 2023-08-07 12:23:10 +03:00
a862e3e045 - Remove libreport-rhel-anaconda-bugzilla from package list 2023-08-04 10:49:56 +03:00
eabdullin
4d69243352 Merge branch 'c8' into a8 2023-05-16 07:07:36 +00:00
743d8c7c0e Fixed AlmaLinux 9 GPG key (thanks elektrowolle) 2023-02-09 17:59:33 +01:00
73d76d5042 Update AlmaLinux patch 2022-11-09 16:19:19 +03:00
eabdullin
6af3ca6b8c Merge branch 'c8' into a8 2022-11-08 14:05:31 +00:00
eabdullin
ce6870bc23 Merge branch 'c8' into a8 2022-11-08 06:43:06 +00:00
dc59d98b24 Add AlmaLinux support 2022-06-10 11:24:31 +03:00
871d52df46 Add AlmaLinux support 2022-06-10 10:33:57 +03:00
3 changed files with 1139 additions and 23 deletions

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,25 @@
From a4435c48480b969785d9afbec7ad3657db24f43b Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 28 Mar 2024 13:12:22 +0300
Subject: [PATCH] Remove libreport-rhel-anaconda-bugzilla from anaconda
packageset
---
vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go | 1 -
1 file changed, 1 deletion(-)
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go
index 05c54e5..68b0100 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go
@@ -214,7 +214,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
"libibverbs",
"libreport-plugin-bugzilla",
"libreport-plugin-reportuploader",
- "libreport-rhel-anaconda-bugzilla",
"librsvg2",
"linux-firmware",
"lklug-fonts",
--
2.39.3 (Apple Git-146)

View File

@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
}
Name: osbuild-composer
Release: 4%{?dist}
Release: 4%{?dist}.alma.1
Summary: An image building service based on osbuild
# osbuild-composer doesn't have support for building i686 and armv7hl images
@ -38,6 +38,10 @@ Source0: %{gosource}
Patch0: CVE-2025-30204.patch
# AlmaLinux Patch
Patch100: 0001-AlmaLinux-support-patch.patch
Patch101: 0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
BuildRequires: systemd
BuildRequires: krb5-devel
@ -148,29 +152,11 @@ 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
# CentOS also defines rhel so we check for centos first
%if 0%{?centos}
# CentOS 9 supports building for CentOS 8 and later
%if 0%{?centos} >= 9
install -m 0644 -vp repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%if 0%{?almalinux}
%if 0%{?almalinux} >= 9
install -m 0644 -vp repositories/almalinux-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%else
# CentOS 8 only supports building for CentOS 8
install -m 0644 -vp repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
install -m 0644 -vp repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%endif
%else
%if 0%{?rhel}
# RHEL 9 supports building for RHEL 8 and later
%if 0%{?rhel} >= 9
install -m 0644 -vp repositories/rhel-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%else
# RHEL 8 only supports building for 8
install -m 0644 -vp repositories/rhel-%{rhel}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%endif
install -m 0644 -vp repositories/almalinux-8* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%endif
%endif
@ -423,6 +409,10 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Mon Jun 30 2025 Eduard Abdullin <eabdullin@almalinux.org> - 101-4.alma.1
- Install AlmaLinux repositories
- Add AlmaLinux support
* Tue Jun 24 2025 Ondřej Budai <obudai@redhat.com> - 101-4
- Resolves: RHEL-89279 (CVE-2025-22871)