Import from AL 9.5 beta
This commit is contained in:
parent
242b0e2e76
commit
93f8b85228
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/osbuild-composer-101.tar.gz
|
||||
SOURCES/osbuild-composer-118.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
0feb86b5dcd146ce5b87816ae482eb50ed507c16 SOURCES/osbuild-composer-101.tar.gz
|
||||
be808e5f869ae48145daef50ed6ed82b91359b48 SOURCES/osbuild-composer-118.tar.gz
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
From a4435c48480b969785d9afbec7ad3657db24f43b Mon Sep 17 00:00:00 2001
|
||||
From a4d0c12c3cfd50b3020a3b4fc142645ac7010387 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
|
||||
Date: Tue, 1 Oct 2024 09:18:38 +0300
|
||||
Subject: [PATCH 1/2] Remove libreport-rhel-anaconda-bugzilla from anaconda
|
||||
packageset
|
||||
|
||||
---
|
||||
vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go | 1 -
|
||||
.../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/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 {
|
||||
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",
|
||||
@ -21,5 +21,5 @@ index 05c54e5..68b0100 100644
|
||||
"linux-firmware",
|
||||
"lklug-fonts",
|
||||
--
|
||||
2.39.3 (Apple Git-146)
|
||||
2.39.5 (Apple Git-154)
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -8,11 +8,11 @@
|
||||
%bcond_with relax_requires
|
||||
|
||||
# The minimum required osbuild version
|
||||
%global min_osbuild_version 109
|
||||
%global min_osbuild_version 120
|
||||
|
||||
%global goipath github.com/osbuild/osbuild-composer
|
||||
|
||||
Version: 101
|
||||
Version: 118
|
||||
|
||||
%gometa
|
||||
|
||||
@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
|
||||
}
|
||||
|
||||
Name: osbuild-composer
|
||||
Release: 2%{?dist}.alma.1
|
||||
Release: 1%{?dist}.alma.1
|
||||
Summary: An image building service based on osbuild
|
||||
|
||||
# osbuild-composer doesn't have support for building i686 and armv7hl images
|
||||
@ -36,8 +36,8 @@ License: Apache-2.0
|
||||
URL: %{gourl}
|
||||
Source0: %{gosource}
|
||||
|
||||
Patch100: 0001-AlmaLinux-support-patch.patch
|
||||
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}
|
||||
@ -109,6 +109,7 @@ export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/comm
|
||||
|
||||
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
|
||||
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
|
||||
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker-executor %{goipath}/cmd/osbuild-worker-executor
|
||||
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-manager %{goipath}/cmd/osbuild-jobsite-manager
|
||||
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-builder %{goipath}/cmd/osbuild-jobsite-builder
|
||||
|
||||
@ -129,6 +130,10 @@ export GOPATH=%{gobuilddir}:%{gopath}
|
||||
|
||||
TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
|
||||
|
||||
%if 0%{?rhel}
|
||||
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/
|
||||
@ -145,6 +150,7 @@ go build -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _b
|
||||
install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer
|
||||
install -m 0755 -vp _bin/osbuild-composer %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||
install -m 0755 -vp _bin/osbuild-worker %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||
install -m 0755 -vp _bin/osbuild-worker-executor %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||
install -m 0755 -vp _bin/osbuild-jobsite-manager %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||
install -m 0755 -vp _bin/osbuild-jobsite-builder %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||
|
||||
@ -152,13 +158,67 @@ install -m 0755 -vp _bin/osbuild-jobsite-builder %{buildroot}%
|
||||
install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories
|
||||
|
||||
%if 0%{?almalinux}
|
||||
%if 0%{?almalinux} >= 9
|
||||
%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%{?centos}
|
||||
|
||||
# Latest CentOS supports building all CentOS versions
|
||||
%if 0%{?centos} >= 10
|
||||
install -m 0644 -vp repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||
|
||||
%else
|
||||
# All other CentOS versions support building for the same version
|
||||
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 10 supports building all RHEL versions
|
||||
%if 0%{?rhel} >= 10
|
||||
for REPO_FILE in $(ls repositories/rhel-* | grep -v 'no-aux-key'); do
|
||||
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
|
||||
done
|
||||
|
||||
# RHEL-8 auxiliary key is signed using SHA-1, which is not enabled by default on RHEL-10 and later
|
||||
for REPO_FILE in $(ls repositories/rhel-8*-no-aux-key.json); do
|
||||
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE} | sed 's/-no-aux-key//g')
|
||||
done
|
||||
|
||||
%else
|
||||
# All other RHEL versions support building for the same version
|
||||
for REPO_FILE in $(ls repositories/rhel-%{rhel}* | grep -v 'no-aux-key'); do
|
||||
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
|
||||
done
|
||||
|
||||
# RHEL 9 supports building also for RHEL 8
|
||||
%if 0%{?rhel} == 9
|
||||
for REPO_FILE in $(ls repositories/rhel-8* | grep -v 'no-aux-key'); do
|
||||
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
|
||||
done
|
||||
%endif
|
||||
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%endif
|
||||
|
||||
|
||||
# Fedora can build for all included fedora releases
|
||||
%if 0%{?fedora}
|
||||
install -m 0644 -vp repositories/fedora-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||
@ -314,6 +374,7 @@ The worker for osbuild-composer
|
||||
|
||||
%files worker
|
||||
%{_libexecdir}/osbuild-composer/osbuild-worker
|
||||
%{_libexecdir}/osbuild-composer/osbuild-worker-executor
|
||||
%{_libexecdir}/osbuild-composer/osbuild-jobsite-manager
|
||||
%{_libexecdir}/osbuild-composer/osbuild-jobsite-builder
|
||||
%{_unitdir}/osbuild-worker@.service
|
||||
@ -381,7 +442,11 @@ Requires: httpd
|
||||
Requires: mod_ssl
|
||||
Requires: openssl
|
||||
Requires: firewalld
|
||||
# podman-plugins has been deprecated since podman version 5.0.0,
|
||||
# which is in Fedora 40+ and in c10s / el10
|
||||
%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?fedora} && 0%{?fedora} < 40)
|
||||
Requires: podman-plugins
|
||||
%endif
|
||||
Requires: dnf-plugins-core
|
||||
Requires: skopeo
|
||||
Requires: make
|
||||
@ -408,22 +473,49 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Sep 26 2024 Eduard Abdullin <eabdullin@almalinux.org> - 101-2.alma.1
|
||||
- Bump release
|
||||
|
||||
* Fri May 24 2024 Eduard Abdullin <eabdullin@almalinux.org> - 101-1.alma.2
|
||||
- Fix 9.4 repos
|
||||
|
||||
* Mon Apr 30 2024 Eduard Abdullin <eabdullin@almalinux.org> - 101-1.alma.1
|
||||
* Tue Oct 01 2024 Eduard Abdullin <eabdullin@almalinux.org> - 118-1.alma.1
|
||||
- Install AlmaLinux repositories
|
||||
- Add AlmaLinux support
|
||||
- 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
|
||||
- New upstream release
|
||||
|
||||
* Wed Aug 21 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 117-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Aug 15 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 116-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Aug 07 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 115-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jul 24 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 114-1
|
||||
- New upstream release
|
||||
|
||||
* Fri Jul 12 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 113-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jun 12 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 110-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Jun 04 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 109-1
|
||||
- New upstream release
|
||||
|
||||
* Fri May 17 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 108-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Apr 03 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 104-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Mar 06 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 102-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Feb 26 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 101-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Feb 07 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 100-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jan 24 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 99-1
|
||||
- New upstream release
|
||||
|
||||
@ -453,7 +545,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
||||
|
||||
* Thu Aug 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Aug 09 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 87-1
|
||||
- New upstream release
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user