- Install AlmaLinux repositories
- Add AlmaLinux support patch (Thanks @pastalian) - Remove libreport-rhel-bugzilla from package set
This commit is contained in:
parent
177749eeed
commit
d0cf707cc5
@ -0,0 +1,25 @@
|
|||||||
|
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)
|
||||||
|
|
1466
0002-AlmaLinux-support-patch.patch
Normal file
1466
0002-AlmaLinux-support-patch.patch
Normal file
File diff suppressed because one or more lines are too long
@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
|
|||||||
}
|
}
|
||||||
|
|
||||||
Name: osbuild-composer
|
Name: osbuild-composer
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}.alma.1
|
||||||
Summary: An image building service based on osbuild
|
Summary: An image building service based on osbuild
|
||||||
|
|
||||||
# osbuild-composer doesn't have support for building i686 and armv7hl images
|
# osbuild-composer doesn't have support for building i686 and armv7hl images
|
||||||
@ -36,6 +36,8 @@ License: Apache-2.0
|
|||||||
URL: %{gourl}
|
URL: %{gourl}
|
||||||
Source0: %{gosource}
|
Source0: %{gosource}
|
||||||
|
|
||||||
|
Patch101: 0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch
|
||||||
|
Patch102: 0002-AlmaLinux-support-patch.patch
|
||||||
|
|
||||||
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
|
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
@ -154,6 +156,22 @@ install -m 0755 -vp _bin/osbuild-jobsite-builder %{buildroot}%
|
|||||||
# Only include repositories for the distribution and release
|
# Only include repositories for the distribution and release
|
||||||
install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories
|
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
|
# CentOS also defines rhel so we check for centos first
|
||||||
%if 0%{?centos}
|
%if 0%{?centos}
|
||||||
|
|
||||||
@ -198,6 +216,8 @@ done
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
# Fedora can build for all included fedora releases
|
# Fedora can build for all included fedora releases
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
install -m 0644 -vp repositories/fedora-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
install -m 0644 -vp repositories/fedora-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||||
@ -452,6 +472,11 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
||||||
|
|
||||||
* Fri Aug 23 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 118-1
|
* Fri Aug 23 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 118-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user