Re: [ptxdist] [PATCH 2/5] ptxdist: add tpm2-tss version 2.1.0

[Marc Kleine-Budde <mkl@pengutronix.de>]

[-- Attachment #1.1.1: Type: text/plain, Size: 6668 bytes --]

On 11/26/18 11:23 AM, Thorsten K. Scherer wrote:
> Signed-off-by: Thorsten K. Scherer <t.scherer@eckelmann.de>
> ---
>  ...rom-the-list-of-libs-to-link-against.patch | 21 ++++++
>  patches/tpm2-tss-2.1.0/series                 |  4 ++
>  rules/tpm.in                                  |  5 ++
>  rules/tpm2-tss.in                             | 22 +++++++
>  rules/tpm2-tss.make                           | 66 +++++++++++++++++++
>  5 files changed, 118 insertions(+)
>  create mode 100644 patches/tpm2-tss-2.1.0/0001-drop-lgcrypt-from-the-list-of-libs-to-link-against.patch
>  create mode 100644 patches/tpm2-tss-2.1.0/series
>  create mode 100644 rules/tpm.in
>  create mode 100644 rules/tpm2-tss.in
>  create mode 100644 rules/tpm2-tss.make
> 
> diff --git a/patches/tpm2-tss-2.1.0/0001-drop-lgcrypt-from-the-list-of-libs-to-link-against.patch b/patches/tpm2-tss-2.1.0/0001-drop-lgcrypt-from-the-list-of-libs-to-link-against.patch
> new file mode 100644
> index 0000000..0230570
> --- /dev/null
> +++ b/patches/tpm2-tss-2.1.0/0001-drop-lgcrypt-from-the-list-of-libs-to-link-against.patch
> @@ -0,0 +1,21 @@
> +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
> +Date: Fri, 12 Oct 2018 11:13:42 +0200
> +Subject: [PATCH] drop -lgcrypt from the list of libs to link against
> +
> +If --with-crypto=ossl is used -lgcrypt is wrong. There shouldn't be any need
> +to explicitly tell the linker because the library already depends the chosen
> +crypto lib

S-o-b missing

> +---
> + lib/tss2-esys.pc.in | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/lib/tss2-esys.pc.in b/lib/tss2-esys.pc.in
> +index 792f01914fd1..ecb01bc16b35 100644
> +--- a/lib/tss2-esys.pc.in
> ++++ b/lib/tss2-esys.pc.in
> +@@ -4,4 +4,4 @@ URL: https://github.com/tpm2-software/tpm2-tss
> + Version: @VERSION@
> + Requires: tss2-mu tss2-sys
> + Cflags: -I@includedir@
> +-Libs: -ltss2-esys -lgcrypt -L@libdir@
> ++Libs: -ltss2-esys -L@libdir@
> diff --git a/patches/tpm2-tss-2.1.0/series b/patches/tpm2-tss-2.1.0/series
> new file mode 100644
> index 0000000..28530d7
> --- /dev/null
> +++ b/patches/tpm2-tss-2.1.0/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-drop-lgcrypt-from-the-list-of-libs-to-link-against.patch
> +# 7d50ba46ba641460d7f0c8558d186ab3  - git-ptx-patches magic
> diff --git a/rules/tpm.in b/rules/tpm.in
> new file mode 100644
> index 0000000..ef93315
> --- /dev/null
> +++ b/rules/tpm.in
> @@ -0,0 +1,5 @@
> +## SECTION=security
> +
> +menu "tpm                           "
> +source "generated/tpm.in"
> +endmenu
> diff --git a/rules/tpm2-tss.in b/rules/tpm2-tss.in
> new file mode 100644
> index 0000000..bfeddb0
> --- /dev/null
> +++ b/rules/tpm2-tss.in
> @@ -0,0 +1,22 @@
> +## SECTION=tpm
> +
> +config TPM2_TSS
> +       tristate
> +       select HOST_AUTOTOOLS_AUTOCONF_ARCHIVE
> +       select OPENSSL
> +       prompt "tpm2-tss"
> +       help
> +         TPM2 Software stack library - TSS and TCTI libraries
> +
> +         TPM2.0 TSS (Software Stack) consists of API layers provided
> +         to support TPM 2.0 chips. It is made out of three layers:
> +
> +         * System API (SAPI), which implements the system layer API;
> +         * TPM Command Transmission Interface (TCTI), which is used
> +           by SAPI to allow communication with the TAB/RM layer;
> +         * Trusted Access Broker/Resource Manager (TAB/RM), which
> +           handles TPM resources and process coordination.
> +
> +         This package contains the TSS and TCTI libraries that client
> +         applications will link against when they require accessing
> +         the TPM.
> diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
> new file mode 100644
> index 0000000..911888d
> --- /dev/null
> +++ b/rules/tpm2-tss.make
> @@ -0,0 +1,66 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2017 by Marc Kleine-Budde <m...@pengutronix.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss
> +
> +#
> +# Paths and names
> +#
> +TPM2_TSS_VERSION       := 2.1.0
> +TPM2_TSS_MD5           := 64e2e9ff34b60502da729504aed5100c
> +TPM2_TSS               := tpm2-tss-$(TPM2_TSS_VERSION)
> +TPM2_TSS_SUFFIX        := tar.gz
> +TPM2_TSS_URL           := https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
> +TPM2_TSS_SOURCE        := $(SRCDIR)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
> +TPM2_TSS_DIR           := $(BUILDDIR)/$(TPM2_TSS)
> +TPM2_TSS_LICENSE       := BSD-2-Clause
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +TPM2_TSS_CONF_TOOL     := autoconf
> +TPM2_TSS_CONF_OPT := \
> +	$(CROSS_AUTOCONF_USR) \
> +	--with-crypto=ossl
> +
> +

1 blank line should be enough

> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/tpm2-tss.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, tpm2-tss)
> +	@$(call install_fixup, tpm2-tss,PRIORITY,optional)
> +	@$(call install_fixup, tpm2-tss,SECTION,base)
> +	@$(call install_fixup, tpm2-tss,AUTHOR,"Marc Kleine-Budde <m...@pengutronix.de>")
> +	@$(call install_fixup, tpm2-tss,DESCRIPTION,missing)
> +
> +	@$(call install_lib, tpm2-tss, tss, tss, 0644, libtss2-mu)
> +	@$(call install_lib, tpm2-tss, tss, tss, 0644, libtss2-tcti-device)
> +	@$(call install_lib, tpm2-tss, tss, tss, 0644, libtss2-tcti-mssim)
> +	@$(call install_lib, tpm2-tss, tss, tss, 0644, libtss2-sys)
> +	@$(call install_lib, tpm2-tss, tss, tss, 0644, libtss2-esys)
> +
> +	@$(call install_copy, tpm2-tss, tss, tss, 1000, $(TPM2_TSS_DIR)/dist/tpm-udev.rules, /usr/lib/udev/rules.d/70-tpm-udev.rules)
> +
> +	@$(call install_finish, tpm2-tss)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> 

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 91 bytes --]

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de