Merge pull request #5258 from cgwalters/release

cgwalters · web-flow · commit f87ee96bf657 · 2025-01-27T10:03:31.000-05:00
Release 2025.3
diff --git a/packaging/rpm-ostree.spec b/packaging/rpm-ostree.spec
@@ -3,7 +3,7 @@
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2025.2
+Version: 2025.3
 Release: 1%{?dist}
 License: LGPL-2.0-or-later
 URL: https://github.com/coreos/rpm-ostree
@@ -39,6 +39,12 @@ BuildRequires: rust
 %else
     %bcond_without ostree_ext
 %endif
+# Integrate with kernel-install
+%if 0%{?rhel} >= 10 || 0%{?fedora} > 41
+    %bcond_with kernel_install
+%else
+    %bcond_without kernel_install
+%endif
 
 # This is copied from the libdnf spec
 %if 0%{?rhel} && ! 0%{?centos}
@@ -218,6 +224,9 @@ sed -i -e '/https:\/\//d' cargo-vendor.txt
 %if %{without ostree_ext}
 rm -vrf $RPM_BUILD_ROOT/usr/libexec/libostree/ext
 %endif
+%if %{without kernel_install}
+rm -vr $RPM_BUILD_ROOT/usr/lib/kernel/install.d
+%endif
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
 # I try to do continuous delivery via rpmdistro-gitoverlay while
diff --git a/src/libpriv/05-rpmostree.install b/src/libpriv/05-rpmostree.install
@@ -1,3 +1,5 @@
 #!/usr/bin/bash
 # This is the hook that has kernel-install call into rpm-ostree kernel-install
-exec /usr/bin/rpm-ostree kernel-install "$@"
+if test -x /usr/bin/rpm-ostree; then
+    exec /usr/bin/rpm-ostree kernel-install "$@"
+fi
