Update to 113
Resolves: RHEL-32133
This commit is contained in:
imagebuilder-bot
parent
d82f6da068
commit
70c3debd9f
1
.gitignore
vendored
1
.gitignore
vendored
@ -93,3 +93,4 @@
|
||||
/osbuild-composer-106.tar.gz
|
||||
/osbuild-composer-108.tar.gz
|
||||
/osbuild-composer-109.tar.gz
|
||||
/osbuild-composer-113.tar.gz
|
||||
|
||||
1232
PR-4179.patch
1232
PR-4179.patch
File diff suppressed because it is too large
Load Diff
@ -1,44 +0,0 @@
|
||||
From 1cc7757f85010539170ff99c5c6f00c75918a8ca Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
|
||||
Date: Tue, 4 Jun 2024 14:52:05 +0200
|
||||
Subject: [PATCH] Tools/provision.sh: adjust conditional EPEL installation for
|
||||
el10
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
EPEL-10 can't be installed on any of c10s and el10. Previously, the
|
||||
script would try to install EPEL repositories package on el10 and fail.
|
||||
|
||||
In addition, use our "workaround" repository with c10s builds of some
|
||||
packages (such as koji) also on el10.
|
||||
|
||||
Signed-off-by: Tomáš Hozza <thozza@redhat.com>
|
||||
---
|
||||
tools/provision.sh | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tools/provision.sh b/tools/provision.sh
|
||||
index 1c6eca8de..bab30fc99 100755
|
||||
--- a/tools/provision.sh
|
||||
+++ b/tools/provision.sh
|
||||
@@ -31,14 +31,14 @@ fi
|
||||
# and install koji and ansible here.
|
||||
#
|
||||
# TODO: Adjust the c10s condition, once EPEL-10 is available.
|
||||
-if [[ $ID == rhel || ($ID == centos && ${VERSION_ID%.*} -lt 10) ]] && ! rpm -q epel-release; then
|
||||
+if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} -lt 10 ]] && ! rpm -q epel-release; then
|
||||
curl -Ls --retry 5 --output /tmp/epel.rpm \
|
||||
https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${VERSION_ID%.*}".noarch.rpm
|
||||
sudo rpm -Uvh /tmp/epel.rpm
|
||||
fi
|
||||
|
||||
# TODO: Remove this workaround, once koji is in EPEL-10
|
||||
-if [[ $ID == centos && ${VERSION_ID%.*} == 10 ]]; then
|
||||
+if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then
|
||||
sudo dnf copr enable -y @osbuild/centpkg "centos-stream-10-$(uname -m)"
|
||||
fi
|
||||
|
||||
--
|
||||
2.45.1
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
%global goipath github.com/osbuild/osbuild-composer
|
||||
|
||||
Version: 109
|
||||
Version: 113
|
||||
|
||||
%gometa
|
||||
|
||||
@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
|
||||
}
|
||||
|
||||
Name: osbuild-composer
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: An image building service based on osbuild
|
||||
|
||||
# osbuild-composer doesn't have support for building i686 and armv7hl images
|
||||
@ -36,10 +36,6 @@ License: Apache-2.0
|
||||
URL: %{gourl}
|
||||
Source0: %{gosource}
|
||||
|
||||
# https://github.com/osbuild/osbuild-composer/pull/4179
|
||||
Patch0: PR-4179.patch
|
||||
# https://github.com/osbuild/osbuild-composer/pull/4186
|
||||
Patch1: PR-4186.patch
|
||||
|
||||
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
|
||||
BuildRequires: systemd
|
||||
@ -110,6 +106,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
|
||||
|
||||
@ -150,6 +147,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/
|
||||
|
||||
@ -167,13 +165,6 @@ install -m 0644 -vp repositories/centos-* %{buildroot}%
|
||||
# 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/
|
||||
|
||||
# CentOS 9 supports building also for CentOS 8
|
||||
%if 0%{?centos} == 9
|
||||
install -m 0644 -vp repositories/centos-8* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||
install -m 0644 -vp repositories/centos-stream-8* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||
%endif
|
||||
|
||||
%endif
|
||||
|
||||
%else
|
||||
@ -183,6 +174,11 @@ install -m 0644 -vp repositories/centos-stream-8* %{buildroot}%{
|
||||
%if 0%{?rhel} >= 10
|
||||
install -m 0644 -vp repositories/rhel-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||
|
||||
# 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
|
||||
install -m 0644 -vp repositories/rhel-%{rhel}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||
@ -351,6 +347,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
|
||||
@ -449,6 +446,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jul 12 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 113-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 109-2
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (osbuild-composer-109.tar.gz) = 0c84cda4265fc5e77cc1906ce0d2fbded32061abcfd00cafab301e7c9edce75b031facabf2f301e6b57ab695168626d9e1651aae10929584fabc66734f3edd56
|
||||
SHA512 (osbuild-composer-113.tar.gz) = b5f9043eb738c86a15e37edc02c08906c28abf11b666913cf845ae555194b627b973055cd68ac78902c8cc33266f0c6c2c8fa6a3379d5e2a1928499bf3a9597d
|
||||
|
||||
Loading…
Reference in New Issue
Block a user