From 8522626d4e8277c913bbcbfe8af0bdbf1f343b3e Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Thu, 7 Aug 2025 10:57:16 +0000 Subject: [PATCH] import OL greenboot-0.15.9-1.el9_6 --- .gitignore | 2 +- .greenboot.metadata | 2 +- SPECS/greenboot.spec | 62 +++++++++++++++++++++++++++++++++++++------- 3 files changed, 54 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 688c268..a55a426 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v0.15.7.tar.gz +SOURCES/v0.15.9.tar.gz diff --git a/.greenboot.metadata b/.greenboot.metadata index 5082309..78ac981 100644 --- a/.greenboot.metadata +++ b/.greenboot.metadata @@ -1 +1 @@ -71aa96136423bf9341d7c9c6dbc9031781d4bfde SOURCES/v0.15.7.tar.gz +7b294c9e6634e8705123c9d046f7ad6d8dbc9e15 SOURCES/v0.15.9.tar.gz diff --git a/SPECS/greenboot.spec b/SPECS/greenboot.spec index 558f64c..31e68f5 100644 --- a/SPECS/greenboot.spec +++ b/SPECS/greenboot.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: greenboot -Version: 0.15.7 +Version: 0.15.9 Release: 1%{?dist} Summary: Generic Health Check Framework for systemd License: LGPL-2.1-or-later @@ -13,7 +13,11 @@ License: LGPL-2.1-or-later URL: https://github.com/%{repo_owner}/%{repo_name} Source0: https://github.com/%{repo_owner}/%{repo_name}/archive/%{repo_tag}.tar.gz +%if 0%{?fedora} || 0%{?rhel} >= 10 +ExcludeArch: s390x %{ix86} +%else ExcludeArch: s390x +%endif BuildRequires: systemd-rpm-macros %{?systemd_requires} Requires: systemd >= 240 @@ -50,7 +54,7 @@ Obsoletes: greenboot-update-platforms-check <= 0.12.0 %{summary}. %prep -%setup -q +%autosetup %build @@ -65,6 +69,7 @@ mkdir -p %{buildroot}%{_prefix}/lib/%{name}/check/required.d mkdir %{buildroot}%{_prefix}/lib/%{name}/check/wanted.d mkdir %{buildroot}%{_prefix}/lib/%{name}/green.d mkdir %{buildroot}%{_prefix}/lib/%{name}/red.d +install -D -t %{buildroot}%{_prefix}/lib/bootupd/grub2-static/configs.d grub2/08_greenboot.cfg mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}/greenboot-healthcheck.service.d mkdir -p %{buildroot}%{_tmpfilesdir} @@ -77,7 +82,6 @@ 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/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/grub.d/greenboot.cfg %{buildroot}%{_sysconfdir}/grub.d/greenboot.cfg %post %systemd_post greenboot-healthcheck.service @@ -90,9 +94,6 @@ install -DpZm 0644 etc/grub.d/greenboot.cfg %{buildroot}%{_sysconfdir}/grub.d/gr %systemd_post greenboot-grub2-set-success.service %systemd_post greenboot-rpm-ostree-grub2-check-fallback.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 %systemd_post greenboot-loading-message.service @@ -121,9 +122,6 @@ fi %systemd_postun greenboot-grub2-set-counter.service %systemd_postun greenboot-grub2-set-success.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 %systemd_postun greenboot-loading-message.service @@ -148,7 +146,7 @@ fi %dir %{_prefix}/lib/%{name}/red.d %{_exec_prefix}/lib/motd.d/boot-status %{_tmpfilesdir}/greenboot-status-motd.conf -%{_sysconfdir}/grub.d/*.cfg +%{_prefix}/lib/bootupd/grub2-static/configs.d/*.cfg %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/%{name} %{_libexecdir}/%{name}/greenboot-grub2-set-success @@ -176,12 +174,56 @@ fi %{_prefix}/lib/%{name}/check/required.d/02_watchdog.sh %changelog +* Tue Mar 25 2025 Sayan Paul - - 0.15.9-1 +- Bump to 0.15.9 +- Bootupd grub2 static ordering + +* Fri Feb 28 2025 Antonio Murdaca - 0.15.8-3 +- Update to version 0.15.8 +- Resolves: RHEL-78244 + +* Fri Feb 28 2025 Antonio Murdaca - 0.15.8-2 +- Update to version 0.15.8 +- Resolves: RHEL-78244 + +* Wed Feb 26 2025 Antonio Murdaca - 0.15.8-1 +## What's Changed + * ci: add ci test for pull request by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/164 + * ci: add more wait time for fallback by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/167 + * ci: fix ansible check failure by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/169 + * ci: add test case of bootc anaconda iso by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/171 + * test github token by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/174 + * update github action by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/177 + * Update greenboot-ci.yaml by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/179 + * ci: fix iso case failure by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/173 + * ci: add support for fedora rawhide by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/181 + * ci: fix rahide failure by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/183 + * ci: fix podman retry issue by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/185 + * ci: add centos-stream-9 support by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/187 + * ci: add rhel 9.6 support by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/190 + * ci: fix rhel 9.6 anaconda case failure by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/193 + * ci: fix secret error by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/195 + * specfile: Stop building on ix86 by @travier in https://github.com/fedora-iot/greenboot/pull/197 + * rollback: if no bootc, fallback to rpm-ostree by @runcom in https://github.com/fedora-iot/greenboot/pull/199 + * fix:fail early for any required script failure by @say-paul in https://github.com/fedora-iot/greenboot/pull/198 + * Release 0.15.8 by @runcom in https://github.com/fedora-iot/greenboot/pull/202 + +## New Contributors + * @travier made their first contribution in https://github.com/fedora-iot/greenboot/pull/197 + + **Full Changelog**: https://github.com/fedora-iot/greenboot/compare/v0.15.7...v0.15.8 +- Resolves: RHEL-78244 + * Thu Oct 31 2024 Sayan Paul - 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 Oct 29 2024 Troy Dawson - 0.15.5-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + * Tue Sep 17 2024 saypaul - 0.15.6-2 - Update to 0.15.6-2