Detect presence of rpm-sign when checking for rhel-ness
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
parent
1d2597d20d
commit
3bf806fd9f
@ -0,0 +1,26 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Mon, 4 Apr 2022 14:45:29 -0400
|
||||
Subject: [PATCH] Detect the presence of rpm-sign when checking for "rhel"-ness
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
[rharwood: manually reapply to main]
|
||||
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
||||
(cherry picked from commit 17e5878cb087e0a766722d3c487f87c41b318f9a)
|
||||
---
|
||||
src/pesign-rpmbuild-helper.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/pesign-rpmbuild-helper.in b/src/pesign-rpmbuild-helper.in
|
||||
index c9d5570..9dee56e 100644
|
||||
--- a/src/pesign-rpmbuild-helper.in
|
||||
+++ b/src/pesign-rpmbuild-helper.in
|
||||
@@ -190,7 +190,7 @@ main() {
|
||||
getfacl -n /run/pesign /run/pesign/socket /var/run/pesign /var/run/pesign/socket 1>&2 ||:
|
||||
fi
|
||||
|
||||
- if [[ "${rhelver}" -ge 7 ]] ; then
|
||||
+ if [[ "${rhelver}" -ge 7 ]] && which rpm-sign >&/dev/null ; then
|
||||
nssdir="$(mktemp -p "${PWD}" -d)"
|
||||
echo > "${nssdir}/pwfile"
|
||||
certutil -N -d "${nssdir}" -f "${nssdir}/pwfile"
|
@ -2,3 +2,4 @@ Patch0001: 0001-daemon-remove-always-true-comparison.patch
|
||||
Patch0002: 0002-Fix-building-signed-kernels-on-setups-other-than-koj.patch
|
||||
Patch0003: 0003-Add-D_GLIBCXX_ASSERTIONS-to-CPPFLAGS.patch
|
||||
Patch0004: 0004-macros.pesign-handle-centos-like-rhel-with-rhelver.patch
|
||||
Patch0005: 0005-Detect-the-presence-of-rpm-sign-when-checking-for-rh.patch
|
||||
|
@ -6,7 +6,7 @@
|
||||
Name: pesign
|
||||
Summary: Signing utility for UEFI binaries
|
||||
Version: 115
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
License: GPL-2.0-only
|
||||
URL: https://github.com/rhboot/pesign
|
||||
|
||||
@ -161,6 +161,9 @@ certutil -d %{_sysconfdir}/pki/pesign/ -X -L > /dev/null
|
||||
%{python3_sitelib}/mockbuild/plugins/pesign.*
|
||||
|
||||
%changelog
|
||||
* Mon Apr 04 2022 Robbie Harwood <rharwood@redhat.com> - 115-5
|
||||
- Detect presence of rpm-sign when checking for rhel-ness
|
||||
|
||||
* Fri Apr 01 2022 Robbie Harwood <rharwood@redhat.com> - 115-4
|
||||
- Correctly handle rhel and centos macros
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user