Compare commits

...

11 Commits
c8 ... a8

Author SHA1 Message Date
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
5 changed files with 996 additions and 35 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/osbuild-composer-75.tar.gz
SOURCES/osbuild-composer-88.tar.gz

View File

@ -1 +1 @@
b03146ce367157bf2ea8028c1a9bdbf27e69de97 SOURCES/osbuild-composer-75.tar.gz
9566fbe6bba91c7b3aba1a57c900aa6c00f77397 SOURCES/osbuild-composer-88.tar.gz

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,11 @@
diff -aruN osbuild-composer-88.3/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go osbuild-composer-88.3.alma/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go
--- osbuild-composer-88.3/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go 2023-11-17 21:41:59
+++ osbuild-composer-88.3.alma/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go 2024-02-07 15:13:07
@@ -214,7 +214,6 @@
"libibverbs",
"libreport-plugin-bugzilla",
"libreport-plugin-reportuploader",
- "libreport-rhel-anaconda-bugzilla",
"librsvg2",
"linux-firmware",
"lklug-fonts",

View File

@ -9,7 +9,7 @@
%global goipath github.com/osbuild/osbuild-composer
Version: 75
Version: 88
%gometa
@ -22,7 +22,7 @@ It is compatible with composer-cli and cockpit-composer clients.
}
Name: osbuild-composer
Release: 1%{?dist}
Release: 1%{?dist}.alma.3
Summary: An image building service based on osbuild
# osbuild-composer doesn't have support for building i686 and armv7hl images
@ -33,6 +33,8 @@ License: Apache-2.0
URL: %{gourl}
Source0: %{gosource}
Patch100: almalinux_support.patch
Patch101: remove_libreport.patch
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
BuildRequires: systemd
@ -114,7 +116,6 @@ go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-te
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tests %{goipath}/cmd/osbuild-auth-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-koji-tests %{goipath}/cmd/osbuild-koji-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-dbjobqueue-tests %{goipath}/cmd/osbuild-composer-dbjobqueue-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-manifest-tests %{goipath}/cmd/osbuild-composer-manifest-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-service-maintenance-tests %{goipath}/cmd/osbuild-service-maintenance
go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openid-provider %{goipath}/cmd/osbuild-mock-openid-provider
@ -128,29 +129,11 @@ install -m 0755 -vp dnf-json %{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
@ -180,7 +163,6 @@ install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}%
install -m 0755 -vp _bin/osbuild-auth-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-koji-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-composer-dbjobqueue-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-composer-manifest-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-service-maintenance-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-mock-openid-provider %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/define-compose-url.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
@ -261,13 +243,13 @@ cd $PWD/_build/src/%{goipath}
%endif
%post
%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
%preun
%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
%postun
%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
%files
%license LICENSE
@ -276,6 +258,7 @@ cd $PWD/_build/src/%{goipath}
%{_unitdir}/osbuild-composer.service
%{_unitdir}/osbuild-composer.socket
%{_unitdir}/osbuild-composer-api.socket
%{_unitdir}/osbuild-composer-prometheus.socket
%{_unitdir}/osbuild-local-worker.socket
%{_unitdir}/osbuild-remote-worker.socket
%{_sysusersdir}/osbuild-composer.conf
@ -295,10 +278,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
Summary: The worker for osbuild-composer
Requires: systemd
Requires: qemu-img
Requires: osbuild >= 80
Requires: osbuild-ostree >= 80
Requires: osbuild-lvm2 >= 80
Requires: osbuild-luks2 >= 80
Requires: osbuild >= 93
Requires: osbuild-ostree >= 93
Requires: osbuild-lvm2 >= 93
Requires: osbuild-luks2 >= 93
Requires: %{name}-dnf-json = %{version}-%{release}
%description worker
@ -417,6 +400,42 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Wed Feb 07 2024 Eduard Abdullin <eabdullin@almalinux.org> - 88-1.alma.3
- Remove libreport-rhel-bugzilla from package set
* Wed Feb 07 2024 Eduard Abdullin <eabdullin@almalinux.org> - 88-1.alma.2
- Add new AlmaLinux-8 key
* Wed Sep 27 2023 Eduard Abdullin <eabdullin@almalinux.org> - 88-1.alma
- Install AlmaLinux repositories
- Add AlmaLinux support
* 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
* Wed Jul 26 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 86-1
- New upstream release
* Fri Jul 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 85-1
- New upstream release
* Wed Jun 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 84-1
- New upstream release
* Wed May 17 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 82-1
- New upstream release
* Wed Apr 19 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 80-1
- New upstream release
* Wed Apr 05 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 79-1
- New upstream release
* Wed Mar 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 77-1
- New upstream release
* Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
- New upstream release