Compare commits
No commits in common. "c8" and "c9-beta" have entirely different histories.
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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -106,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
|
||||
|
||||
@ -126,6 +127,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/
|
||||
@ -142,32 +147,52 @@ 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/
|
||||
|
||||
# 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
|
||||
# Latest CentOS supports building all CentOS versions
|
||||
%if 0%{?centos} >= 10
|
||||
install -m 0644 -vp repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||
|
||||
%else
|
||||
# CentOS 8 only supports building for CentOS 8
|
||||
# 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 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/
|
||||
|
||||
%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
|
||||
@ -328,6 +353,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
|
||||
@ -395,7 +421,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
|
||||
@ -422,6 +452,39 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
@ -452,9 +515,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
||||
* Wed Oct 04 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 91-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Sep 21 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 90-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Sep 06 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 89-1
|
||||
- New upstream release
|
||||
|
||||
@ -485,6 +545,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
||||
* Wed Mar 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 77-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Mar 01 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 76-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
|
||||
- New upstream release
|
||||
|
||||
@ -509,6 +572,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
||||
* Wed Nov 16 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 68-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Nov 03 2022 Tomas Hozza <thozza@redhat.com> - 67-2
|
||||
- Fix functional tests to make them pass in RHEL-9.2 gating
|
||||
|
||||
* Wed Nov 02 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 67-1
|
||||
- New upstream release
|
||||
|
||||
@ -518,13 +584,13 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
||||
* Wed Aug 24 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 60-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Aug 11 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
|
||||
* Wed Aug 10 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Jul 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 58-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Jul 18 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
|
||||
* Wed Jul 13 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jun 15 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 55-1
|
||||
@ -533,81 +599,139 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
||||
* Wed Jun 01 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 54-1
|
||||
- New upstream release
|
||||
|
||||
* Mon May 23 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 53-1
|
||||
* Fri May 20 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 53-1
|
||||
- New upstream release
|
||||
|
||||
* Wed May 04 2022 Ondřej Budai <ondrej@budai.cz> - 51-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Mar 01 2022 Ondřej Budai <ondrej@budai.cz> - 46-1
|
||||
* Mon Feb 28 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 46-1
|
||||
- New upstream release
|
||||
|
||||
* Sat Feb 19 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
|
||||
* Fri Feb 18 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Feb 14 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
|
||||
* Fri Feb 11 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Feb 07 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
|
||||
* Wed Jan 26 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Jan 18 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
|
||||
* Wed Jan 12 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Dec 22 2021 Ondřej Budai <ondrej@budai.cz> - 41-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Dec 09 2021 Ondřej Budai <ondrej@budai.cz> - 40-1
|
||||
- New upstream release
|
||||
|
||||
* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 37-1
|
||||
* Wed Nov 24 2021 Chloe Kaubisch <chloe.kaubisch@gmail.com> - 39-1
|
||||
- New upstream release
|
||||
|
||||
* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
|
||||
* Fri Nov 12 2021 'Diaa Sami' <'<disami@redhat.com>'> - 38-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Nov 02 2021 lavocatt - 37-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Oct 14 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Aug 30 2021 Tom Gundersen <teg@jklm.no> - 33-1
|
||||
- New upstream release
|
||||
|
||||
* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-2
|
||||
* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Aug 12 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
|
||||
* Sun Aug 15 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 30-2
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Jul 02 2021 Ondřej Budai <ondrej@budai.cz> - 30-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 29-3
|
||||
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
||||
Related: rhbz#1971065
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 29-2
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Fri Mar 05 2021 Martin Sehnoutka <msehnout@redhat.com> - 29-1
|
||||
- New upstream release
|
||||
|
||||
* Sat Feb 20 2021 Martin Sehnoutka <msehnout@redhat.com> - 28-1
|
||||
- New upstream release
|
||||
|
||||
* Fri Feb 05 2021 Ondrej Budai <obudai@redhat.com> - 27-1
|
||||
* Thu Feb 04 2021 Ondrej Budai <obudai@redhat.com> - 27-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 26-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-2
|
||||
- Fix the compatibility with a new golang-github-azure-storage-blob 0.12
|
||||
|
||||
* Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Nov 30 2020 Ondrej Budai <obudai@redhat.com> - 25-1
|
||||
- New upstream release 25 (rhbz#1883481)
|
||||
* Thu Nov 19 2020 Ondrej Budai <obudai@redhat.com> - 25-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Sep 03 2020 Tom Gundersen <tgunders@redhat.com> - 20.1-1
|
||||
- New upstream release 20.1 (rhbz#1872370)
|
||||
* Thu Nov 12 2020 Ondrej Budai <obudai@redhat.com> - 24-1
|
||||
- New upstream release
|
||||
|
||||
* Sun Aug 23 2020 Tom Gundersen <tgunders@redhat.com> - 20-1
|
||||
- New upstream release 20 (rhbz#1871184 and rhbz#1871179)
|
||||
* Fri Nov 06 2020 Ondrej Budai <obudai@redhat.com> - 23-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Aug 13 2020 Tom Gundersen <tgunders@redhat.com> - 19-1
|
||||
- New upstream release 19 (rhbz#1866015 and rhbz#1866013)
|
||||
* Fri Oct 16 2020 Ondrej Budai <obudai@redhat.com> - 22-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Jul 09 2020 Ondrej Budai <obudai@redhat.com> - 17-1
|
||||
- New upstream release 17 (rhbz#1831653)
|
||||
- Obsolete lorax-composer in favor of osbuild-composer (rhbz#1836844)
|
||||
* Sun Aug 23 2020 Tom Gundersen <teg@jklm.no> - 20-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Aug 11 2020 Tom Gundersen <teg@jklm.no> - 19-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 22 2020 Ondrej Budai <obudai@redhat.com> - 18-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jul 08 2020 Ondrej Budai <obudai@redhat.com> - 17-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Jun 29 2020 Ondrej Budai <obudai@redhat.com> - 16-1
|
||||
- New upstream release 16 (rhbz#1831653)
|
||||
- New upstream release
|
||||
|
||||
* Fri Jun 12 2020 Ondrej Budai <obudai@redhat.com> - 15-1
|
||||
- New upstream release 15 (rhbz#1831653)
|
||||
- New upstream release
|
||||
|
||||
* Thu Jun 04 2020 Ondrej Budai <obudai@redhat.com> - 14-1
|
||||
- New upstream release 14 (rhbz#1831653)
|
||||
- New upstream release
|
||||
|
||||
* Fri May 29 2020 Ondrej Budai <obudai@redhat.com> - 13-2
|
||||
- Add missing osbuild-ostree dependency
|
||||
|
||||
* Thu May 28 2020 Ondrej Budai <obudai@redhat.com> - 13-1
|
||||
- New upstream release 13 (rhbz#1831653)
|
||||
- New upstream release
|
||||
|
||||
* Tue May 05 2020 Ondrej Budai <obudai@redhat.com> - 11-1
|
||||
- Initial package (renamed from golang-github-osbuild-composer) (rhbz#1771887)
|
||||
* Thu May 14 2020 Ondrej Budai <obudai@redhat.com> - 12-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Apr 29 2020 Ondrej Budai <obudai@redhat.com> - 11-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Apr 15 2020 Ondrej Budai <obudai@redhat.com> - 10-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Apr 01 2020 Ondrej Budai <obudai@redhat.com> - 9-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Mar 23 2020 Ondrej Budai <obudai@redhat.com> - 8-1
|
||||
- Initial package (renamed from golang-github-osbuild-composer)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user