Bootc compatiblity

Resolves: RHEL-73304
This commit is contained in:
saypaul 2025-01-15 13:35:13 +05:30
parent 580b6a5fa8
commit 0b86ec78aa
2 changed files with 23 additions and 6 deletions

View File

@ -1,8 +1,8 @@
%global debug_package %{nil} %global debug_package %{nil}
Name: greenboot Name: greenboot
Version: 0.15.5 Version: 0.15.7
Release: 3%{?dist} Release: 1%{?dist}
Summary: Generic Health Check Framework for systemd Summary: Generic Health Check Framework for systemd
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -19,7 +19,6 @@ BuildRequires: systemd-rpm-macros
Requires: systemd >= 240 Requires: systemd >= 240
Requires: grub2-tools-minimal Requires: grub2-tools-minimal
Requires: rpm-ostree Requires: rpm-ostree
Requires: bootupd
# PAM is required to programatically read motd messages from /etc/motd.d/* # PAM is required to programatically read motd messages from /etc/motd.d/*
# This causes issues with RHEL-8 as the fix isn't there an el8 is on pam-1.3.x # This causes issues with RHEL-8 as the fix isn't there an el8 is on pam-1.3.x
Requires: pam >= 1.4.0 Requires: pam >= 1.4.0
@ -66,7 +65,6 @@ mkdir -p %{buildroot}%{_prefix}/lib/%{name}/check/required.d
mkdir %{buildroot}%{_prefix}/lib/%{name}/check/wanted.d mkdir %{buildroot}%{_prefix}/lib/%{name}/check/wanted.d
mkdir %{buildroot}%{_prefix}/lib/%{name}/green.d mkdir %{buildroot}%{_prefix}/lib/%{name}/green.d
mkdir %{buildroot}%{_prefix}/lib/%{name}/red.d mkdir %{buildroot}%{_prefix}/lib/%{name}/red.d
install -D -t %{buildroot}%{_prefix}/lib/bootupd/grub2-static/configs.d grub2/greenboot.cfg
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
mkdir -p %{buildroot}%{_unitdir}/greenboot-healthcheck.service.d mkdir -p %{buildroot}%{_unitdir}/greenboot-healthcheck.service.d
mkdir -p %{buildroot}%{_tmpfilesdir} mkdir -p %{buildroot}%{_tmpfilesdir}
@ -79,6 +77,7 @@ install -DpZm 0644 usr/lib/tmpfiles.d/greenboot-status-motd.conf %{buildroot}%{_
install -DpZm 0755 usr/lib/greenboot/check/required.d/* %{buildroot}%{_prefix}/lib/%{name}/check/required.d install -DpZm 0755 usr/lib/greenboot/check/required.d/* %{buildroot}%{_prefix}/lib/%{name}/check/required.d
install -DpZm 0755 usr/lib/greenboot/check/wanted.d/* %{buildroot}%{_prefix}/lib/%{name}/check/wanted.d install -DpZm 0755 usr/lib/greenboot/check/wanted.d/* %{buildroot}%{_prefix}/lib/%{name}/check/wanted.d
install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{name}/greenboot.conf install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{name}/greenboot.conf
install -DpZm 0644 etc/grub.d/greenboot.cfg %{buildroot}%{_sysconfdir}/grub.d/greenboot.cfg
%post %post
%systemd_post greenboot-healthcheck.service %systemd_post greenboot-healthcheck.service
@ -91,6 +90,9 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam
%systemd_post greenboot-grub2-set-success.service %systemd_post greenboot-grub2-set-success.service
%systemd_post greenboot-rpm-ostree-grub2-check-fallback.service %systemd_post greenboot-rpm-ostree-grub2-check-fallback.service
%systemd_post redboot-auto-reboot.service %systemd_post redboot-auto-reboot.service
if [ -d /usr/lib/bootupd/grub2-static/configs.d ]; then
cp /etc/grub.d/greenboot.cfg /usr/lib/bootupd/grub2-static/configs.d
fi
%post default-health-checks %post default-health-checks
%systemd_post greenboot-loading-message.service %systemd_post greenboot-loading-message.service
@ -119,6 +121,9 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam
%systemd_postun greenboot-grub2-set-counter.service %systemd_postun greenboot-grub2-set-counter.service
%systemd_postun greenboot-grub2-set-success.service %systemd_postun greenboot-grub2-set-success.service
%systemd_postun greenboot-rpm-ostree-grub2-check-fallback.service %systemd_postun greenboot-rpm-ostree-grub2-check-fallback.service
if [ -f /usr/lib/bootupd/grub2-static/configs.d/greenboot.cfg ]; then
rm -f /usr/lib/bootupd/grub2-static/configs.d/greenboot.cfg
fi
%postun default-health-checks %postun default-health-checks
%systemd_postun greenboot-loading-message.service %systemd_postun greenboot-loading-message.service
@ -143,7 +148,7 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam
%dir %{_prefix}/lib/%{name}/red.d %dir %{_prefix}/lib/%{name}/red.d
%{_exec_prefix}/lib/motd.d/boot-status %{_exec_prefix}/lib/motd.d/boot-status
%{_tmpfilesdir}/greenboot-status-motd.conf %{_tmpfilesdir}/greenboot-status-motd.conf
%{_prefix}/lib/bootupd/grub2-static/configs.d/*.cfg %{_sysconfdir}/grub.d/*.cfg
%dir %{_libexecdir}/%{name} %dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/%{name} %{_libexecdir}/%{name}/%{name}
%{_libexecdir}/%{name}/greenboot-grub2-set-success %{_libexecdir}/%{name}/greenboot-grub2-set-success
@ -171,6 +176,18 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam
%{_prefix}/lib/%{name}/check/required.d/02_watchdog.sh %{_prefix}/lib/%{name}/check/required.d/02_watchdog.sh
%changelog %changelog
* Thu Oct 31 2024 Sayan Paul <paul.sayan@gmail.com> - 0.15.7-1
- Update to 0.15.7
- Reword warning message for disabled checks
- Fixed the issue that boot_counter cannot be unset and some scripts do not have executable permissions
- Packit: only use IoT relevant branches
* Tue Sep 17 2024 saypaul <paul.sayan@gmail.com> - 0.15.6-2
- Update to 0.15.6-2
* Tue Sep 10 2024 Paul Whalen <pwhalen@fedoraproject.org> - 0.15.6-1
- Update to 0.15.6
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.15.5-3 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.15.5-3
- Bump release for October 2024 mass rebuild: - Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018 Resolves: RHEL-64018

View File

@ -1 +1 @@
SHA512 (v0.15.5.tar.gz) = 27207b0e91c53caa9e9bf85b5f1bbfc0a499f1796d6e7b17b9c32866b3103db7a517e03752e5174ab03fc5b17b60eca898e112fbfe081fd3f89e3de3640c5eed SHA512 (v0.15.7.tar.gz) = 6b9d4225332e0be57be352d81dc14f8fde388b2aedb3528247e60de359be9b0b7d84cd038c022695d67a6b256d5a77dd5ef95a53095e864d99bdcbec0c90f038