commit 9f95f1fd6e0014dcfa3e9752cd23a197d0323f3c
Author: Jakub Bogusz <[email protected]>
Date: Mon Jun 14 21:56:51 2021 +0200
- added install patch (don't try to create user/group on make install)
tpm2-tss-install.patch | 35 +++++++++++++++++++++++++++++++++++
tpm2-tss.spec | 2 ++
2 files changed, 37 insertions(+)
---
diff --git a/tpm2-tss.spec b/tpm2-tss.spec
index 4233999..f80904e 100644
--- a/tpm2-tss.spec
+++ b/tpm2-tss.spec
@@ -12,6 +12,7 @@ Group: Libraries
#Source0Download: https://github.com/tpm2-software/tpm2-tss/releases
Source0:
https://github.com/tpm2-software/tpm2-tss/releases/download/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 4d04cf52fff4ee061bb3f7b4f4ea03b7
+Patch0: %{name}-install.patch
URL: https://github.com/tpm2-software/tpm2-tss
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -87,6 +88,7 @@ Biblioteka statyczna tpm2-tss.
%prep
%setup -q
+%patch0 -p1
%build
%{__libtoolize}
diff --git a/tpm2-tss-install.patch b/tpm2-tss-install.patch
new file mode 100644
index 0000000..6c625e7
--- /dev/null
+++ b/tpm2-tss-install.patch
@@ -0,0 +1,35 @@
+--- tpm2-tss-3.1.0/configure.ac.orig 2021-05-17 20:42:46.000000000 +0200
++++ tpm2-tss-3.1.0/configure.ac 2021-06-14 21:52:12.075225467 +0200
+@@ -470,15 +470,6 @@
+ AM_CONDITIONAL(SYSD_SYSUSERS, test "x$systemd_sysusers" = "xyes")
+ AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes)
+ AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes")
+-# Check all tools used by make install
+-AS_IF([test "$HOSTOS" = "Linux"],
+- [ERROR_IF_NO_PROG([groupadd])
+- ERROR_IF_NO_PROG([useradd])
+- ERROR_IF_NO_PROG([id])
+- ERROR_IF_NO_PROG([chown])
+- ERROR_IF_NO_PROG([chmod])
+- ERROR_IF_NO_PROG([mkdir])
+- ERROR_IF_NO_PROG([setfacl])])
+
+ AC_SUBST([PATH])
+
+--- tpm2-tss-3.1.0/Makefile.am.orig 2021-06-14 21:53:10.804907301 +0200
++++ tpm2-tss-3.1.0/Makefile.am 2021-06-14 21:53:13.818224310 +0200
+@@ -689,14 +689,6 @@
+ EXTRA_DIST += dist/tpm-udev.rules
+
+ install-dirs:
+-if HOSTOS_LINUX
+-if SYSD_SYSUSERS
+- @echo "systemd-sysusers
$(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf"
+- @systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf ||
echo "WARNING Failed to create the tss user and group"
+-else
+- @echo "call make_tss_user_and_group"
+- @$(call make_tss_user_and_group) || echo "WARNING Failed to create the
tss user and group"
+-endif
+ if SYSD_TMPFILES
+ @echo "systemd-tmpfiles --create
$(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf"
+ @systemd-tmpfiles --create
$(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf|| echo "WARNING Failed to
create the FAPI directories with the correct permissions"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tpm2-tss.git/commitdiff/9f95f1fd6e0014dcfa3e9752cd23a197d0323f3c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
