swtpm: 0.5.2 -> 0.6.0
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
This commit is contained in:
parent
d66edf1450
commit
e3f62ec19a
@ -1,68 +1,49 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub, fetchpatch
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, libtasn1, openssl, fuse, glib, libseccomp
|
, libtasn1, openssl, fuse, glib, libseccomp, json-glib
|
||||||
, libtpms
|
, libtpms
|
||||||
, unixtools, expect, socat
|
, unixtools, expect, socat
|
||||||
, gnutls
|
, gnutls
|
||||||
, perl
|
, perl
|
||||||
, python3, python3Packages
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "swtpm";
|
pname = "swtpm";
|
||||||
version = "0.5.2";
|
version = "0.6.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "stefanberger";
|
owner = "stefanberger";
|
||||||
repo = "swtpm";
|
repo = "swtpm";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-KY5V4z/8I15ePjorgZueNahlD/xvFa3tDarA0tuRxFk=";
|
sha256 = "sha256-7YzdwGAGECj7PhaCOf/dLSILPXqtbylCkN79vuFBw5Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonPath = with python3Packages; requiredPythonModules [
|
|
||||||
setuptools
|
|
||||||
cryptography
|
|
||||||
];
|
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# upstream looks for /usr directory in $prefix to check
|
(fetchpatch {
|
||||||
# whether or not to proceed with installation of python
|
url = "https://patch-diff.githubusercontent.com/raw/stefanberger/swtpm/pull/527.patch";
|
||||||
# tools (swtpm_setup utility).
|
sha256 = "sha256-cpKHP15a27ifmmswSgHoNzGPO6TY/ZuJIfM5xLOlqlU=";
|
||||||
./python-installation.patch
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
prePatch = ''
|
|
||||||
patchShebangs src/swtpm_setup/setup.py
|
|
||||||
patchShebangs samples/setup.py
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config unixtools.netstat expect socat
|
pkg-config unixtools.netstat expect socat
|
||||||
perl # for pod2man
|
perl # for pod2man
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
python3
|
|
||||||
];
|
];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libtpms
|
libtpms
|
||||||
openssl libtasn1 libseccomp
|
openssl libtasn1 libseccomp
|
||||||
fuse glib
|
fuse glib json-glib
|
||||||
gnutls
|
gnutls
|
||||||
python3.pkgs.wrapPython
|
|
||||||
];
|
];
|
||||||
propagatedBuildInputs = pythonPath;
|
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-cuse"
|
"--with-cuse"
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
wrapPythonProgramsIn $out/bin "$out $pythonPath"
|
|
||||||
wrapPythonProgramsIn $out/share/swtpm "$out $pythonPath"
|
|
||||||
'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
outputs = [ "out" "man" ];
|
outputs = [ "out" "man" ];
|
||||||
|
@ -1,60 +0,0 @@
|
|||||||
commit 353794feb596d95e3f8893e39b174c5a89d1013e
|
|
||||||
Author: Arthur Gautier <baloo@superbaloo.net>
|
|
||||||
Date: Wed Feb 17 02:27:40 2021 +0000
|
|
||||||
|
|
||||||
python-install
|
|
||||||
|
|
||||||
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
|
|
||||||
|
|
||||||
diff --git a/samples/Makefile.am b/samples/Makefile.am
|
|
||||||
index 7d69bf8..1803bb9 100644
|
|
||||||
--- a/samples/Makefile.am
|
|
||||||
+++ b/samples/Makefile.am
|
|
||||||
@@ -39,19 +39,9 @@ python-uninstall:
|
|
||||||
$(PIP3) uninstall -y $(PY_PACKAGE_NAME)
|
|
||||||
|
|
||||||
if PYTHON_INSTALLATION
|
|
||||||
-install-exec-local: $(PY_PACKAGE)
|
|
||||||
- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
|
|
||||||
- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \
|
|
||||||
- else \
|
|
||||||
- $(MAKE) python-install; \
|
|
||||||
- fi
|
|
||||||
+install-exec-local: python-install
|
|
||||||
|
|
||||||
-uninstall-local:
|
|
||||||
- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
|
|
||||||
- echo "Cleanup for distcheck build not implemented" ; \
|
|
||||||
- else \
|
|
||||||
- $(MAKE) python-uninstall; \
|
|
||||||
- fi
|
|
||||||
+uninstall-local: python-uninstall
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am
|
|
||||||
index 529eefe..533b1b3 100644
|
|
||||||
--- a/src/swtpm_setup/Makefile.am
|
|
||||||
+++ b/src/swtpm_setup/Makefile.am
|
|
||||||
@@ -29,19 +29,9 @@ python-uninstall:
|
|
||||||
$(PIP3) uninstall -y $(PY_PACKAGE_NAME)
|
|
||||||
|
|
||||||
if PYTHON_INSTALLATION
|
|
||||||
-install-exec-local: $(PY_PACKAGE)
|
|
||||||
- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
|
|
||||||
- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \
|
|
||||||
- else \
|
|
||||||
- $(MAKE) python-install; \
|
|
||||||
- fi
|
|
||||||
+install-exec-local: python-install
|
|
||||||
|
|
||||||
-uninstall-local:
|
|
||||||
- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
|
|
||||||
- echo "Cleanup for distcheck build not implemented" ; \
|
|
||||||
- else \
|
|
||||||
- $(MAKE) python-uninstall; \
|
|
||||||
- fi
|
|
||||||
+uninstall-local: python-uninstall
|
|
||||||
endif
|
|
||||||
|
|
||||||
# for out-of-tree builds we need to clean up
|
|
Loading…
Reference in New Issue
Block a user