mirrors/meta-secure-core
1
0
Fork 0
mirror of https://github.com/jiazhang0/meta-secure-core.git synced 2026-07-16 12:47:00 +00:00
Code Issues Projects Releases Wiki Activity

update tpm2-tools_3.2.1 -> tpm2-tools_4.1.1.bb, tpm2-abrmd_2.0.3 -> tpm2-abrmd_2.3.0, tpm2-tss_2.2.3.bb -> tpm2-tss_2.3.2.bb

Browse Source
This commit is contained in:
richard
2020-06-16 12:59:13 +02:00
committed by Jia Zhang
parent c39b30e99f
commit 3590e302df
17 changed files with 85 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2/0002-luks-setup.sh-Updated-TPM-Tools.patch
Executable
+11
View File
@@ -0,0 +1,11 @@
--- a/scripts/luks-setup.sh 2020-02-17 15:23:50.214278216 +0100
+++ b/scripts/luks-setup.sh 2020-02-17 15:22:41.054281439 +0100
@@ -402,7 +402,7 @@
detect_tpm
if [ $? -eq 0 ]; then
if [ $OPT_EVICT_ALL -eq 1 ]; then
- cmd="tpm2_takeownership --clear"
+ cmd="tpm2_clear"
[ -n "$OPT_OLD_LOCKOUT_AUTH" ] && cmd="${cmd} --oldLockPasswd $OPT_OLD_LOCKOUT_AUTH"
[ -n "$OPT_LOCKOUT_AUTH" ] && cmd="${cmd} --LockPasswd $OPT_LOCKOUT_AUTH"
eval "$cmd"
meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb
+1
View File
@@ -23,6 +23,7 @@ SRC_URI = "\
git://github.com/jiazhang0/cryptfs-tpm2.git \
file://0001-luks-setup.sh-Add-support-for-qemu-with-the-swtpm.patch \
file://0001-encrypt_secret.py-switch-to-python3.patch \
file://0002-luks-setup.sh-Updated-TPM-Tools.patch \
"
SRCREV = "87c35c63090a33d4de437f518b8da9f2d1f1d828"
meta-tpm2/recipes-tpm/tpm2-abrmd/files/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch
-69
View File
@@ -1,69 +0,0 @@
From 3cacba40114f26650c681b067ff0495f4a0dd186 Mon Sep 17 00:00:00 2001
From: Jonas Witschel <diabonas@gmx.de>
Date: Fri, 25 Jan 2019 16:52:21 +0100
Subject: [PATCH] build: update for ax_code_coverage.m4 version 2019.01.06
@CODE_COVERAGE_RULES@ doesn't exist any more and needs to be replaced.
Also includes a compatibility wrapper for older versions of the file.
There is a bug in the new version of ax_code_coverage.m4
(cf. https://github.com/autoconf-archive/autoconf-archive/pull/182):
AM_DISTCHECK_CONFIGURE_FLAGS is recursively defined, which causes
"make distcheck" to fail in combination with --enable-code-coverage.
This is fixed by overwriting the faulty definition.
Upstream-Status: Backport [https://github.com/tpm2-software/tpm2-abrmd/commit/3cacba40114f26650c681b067ff0495f4a0dd186]
Signed-off-by: Jonas Witschel <diabonas@gmx.de>
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
---
Makefile.am | 15 +++++++++++++++
configure.ac | 5 +++++
2 files changed, 17 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 68c5359..eaeca94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,7 +166,22 @@ dbusservicedir = $(datadir)/dbus-1/system-services
dbusservice_DATA = dist/com.intel.tss2.Tabrmd.service
endif # HAVE_SYSTEMD
+# ax_code_coverage
+if AUTOCONF_CODE_COVERAGE_2019_01_06
+include $(top_srcdir)/aminclude_static.am
+clean-local: code-coverage-clean
+distclean-local: code-coverage-dist-clean
+
+# workaround for a bug in Autoconf Archive 2019.01.06
+# (https://github.com/autoconf-archive/autoconf-archive/pull/182)
+if CODE_COVERAGE_ENABLED
+AM_DISTCHECK_CONFIGURE_FLAGS := $(AM_DISTCHECK_CONFIGURE_FLAGS) --disable-code-coverage
+endif # CODE_COVERAGE_ENABLED
+
+else # AUTOCONF_CODE_COVERAGE_2019_01_06
@CODE_COVERAGE_RULES@
+endif # AUTOCONF_CODE_COVERAGE_2019_01_06
+
@VALGRIND_CHECK_RULES@
VALGRIND_G_DEBUG = fatal-criticals,gc-friendly
VALGRIND_memcheck_FLAGS = --leak-check=full --show-leak-kinds=definite,indirect --track-origins=yes --error-exitcode=1
diff --git a/configure.ac b/configure.ac
index 504db32..6f35fb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,11 @@ AS_IF([test ! -x "$(which $GDBUS_CODEGEN)"],
[AC_MSG_ERROR([*** gdbus-codegen is required to build tpm2-abrmd])])
AX_CODE_COVERAGE
+m4_ifdef([_AX_CODE_COVERAGE_RULES],
+ [AM_CONDITIONAL(AUTOCONF_CODE_COVERAGE_2019_01_06, [true])],
+ [AM_CONDITIONAL(AUTOCONF_CODE_COVERAGE_2019_01_06, [false])])
+AX_ADD_AM_MACRO_STATIC([])
+
# disable helgrind and drd, they hate GAsyncQueue
AX_VALGRIND_DFLT([sgcheck], [off])
AX_VALGRIND_DFLT([helgrind], [off])
--
2.7.4
meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default
+1 -1
View File
@@ -1 +1 @@
DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transients=20"
DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transients=20 --flush-all"
meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.0.3.bb
-9
View File
@@ -1,9 +0,0 @@
include ${BPN}.inc
SRC_URI += " \
https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \
file://0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch \
file://tpm2-abrmd.default \
"
SRC_URI[md5sum] = "a71faf008de2e444265b0d1d889cab2e"
SRC_URI[sha256sum] = "ff0ed283b0300cd784d6bf2b042e167020f8443602974e53b924e9fd98a4b515"
meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc → meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.3.0.bb
+20 -17
View File
@@ -1,27 +1,32 @@
SUMMARY = "TPM2 Access Broker & Resource Manager"
DESCRIPTION = "This is a system daemon implementing the TPM2 Access Broker (AB) \
and Resource Manager (RM) specification from the TCG (Trusted Computing Group). \
The daemon (tpm2-abrmd) is implemented using Glib and the GObject system."
HOMEPAGE = "https://github.com/tpm2-software/tpm2-abrmd"
DESCRIPTION = "This is a system daemon implementing the TPM2 access \
broker (TAB) & Resource Manager (RM) spec from the TCG. The daemon (tpm2-abrmd) \
is implemented using Glib and the GObject system. In this documentation and \
in the code we use `tpm2-abrmd` and `tabrmd` interchangeably. \
"
SECTION = "security/tpm"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da"
DEPENDS += " \
autoconf-archive-native dbus glib-2.0 glib-2.0-native \
tpm2-tss libtss2 libtss2-mu libtss2-tcti-device libtss2-tcti-mssim \
"
DEPENDS = "autoconf-archive dbus glib-2.0 tpm2-tss glib-2.0-native \
libtss2 libtss2-mu libtss2-tcti-device libtss2-tcti-mssim"
SRC_URI = "\
git://github.com/tpm2-software/tpm2-abrmd.git \
file://tpm2-abrmd-init.sh \
file://tpm2-abrmd.default \
"
SRCREV = "ac82192df1158cb58eac02777cf15c965b02cfbc"
S = "${WORKDIR}/git"
inherit autotools pkgconfig systemd update-rc.d useradd
SYSTEMD_PACKAGES += "${PN}"
SYSTEMD_SERVICE_${PN} = "tpm2-abrmd.service"
SYSTEMD_AUTO_ENABLE_${PN} = "enable"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"
INITSCRIPT_NAME = "${PN}"
INITSCRIPT_PARAMS = "start 99 2 3 4 5 . stop 19 0 1 6 ."
@@ -30,10 +35,8 @@ USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "tss"
USERADD_PARAM_${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss"
EXTRA_OECONF += "\
--with-systemdsystemunitdir=${systemd_system_unitdir} \
--with-systemdpresetdir=${systemd_unitdir}/system-preset \
"
PACKAGECONFIG ?="${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', '', d)}"
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, --with-systemdsystemunitdir=no"
do_install_append() {
install -d "${D}${sysconfdir}/init.d"
@@ -43,9 +46,9 @@ do_install_append() {
install -m 0644 "${WORKDIR}/tpm2-abrmd.default" "${D}${sysconfdir}/default/tpm2-abrmd"
}
FILES_${PN} += "\
${systemd_unitdir}/system-preset \
${datadir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service \
"
FILES_${PN} += "${libdir}/systemd/system-preset \
${datadir}/dbus-1"
RDEPENDS_${PN} += "tpm2-tss"
BBCLASSEXTEND = "native"
meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb
-28
View File
@@ -1,28 +0,0 @@
include ${BPN}.inc
DEFAULT_PREFERENCE = "-1"
PVBASE := "${PV}"
PV = "${PVBASE}.${SRCPV}"
SRC_URI += " \
git://github.com/01org/${BPN}.git;protocol=git;branch=master;name=${BPN};destsuffix=${BPN} \
"
def version_git(d):
version = d.getVar("PREFERRED_VERSION_%s" % d.getVar('PN'))
if version is not None and "git" in version:
return d.getVar("AUTOREV")
else:
return "cceb6c12ebb335aacb49207ee13d2f2fc833580a"
SRCREV ?= '${@version_git(d)}'
S = "${WORKDIR}/${BPN}"
do_configure_prepend () {
# execute the bootstrap script
currentdir="$(pwd)"
cd "${S}"
AUTORECONF=true ./bootstrap
cd "${currentdir}"
}
meta-tpm2/recipes-tpm/tpm2-tools/files/0001-test-fix-yaml.load-warning.patch
-92
View File
@@ -1,92 +0,0 @@
From 0de180698bc992420fa8670d1ecce24008a4e3b9 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Tue, 10 Mar 2020 11:18:51 +0800
Subject: [PATCH] test: fix yaml.load warning
The yaml.load(f) is deprecated since pyyaml 5.1.
Use yaml.load(f, Loader=yaml.BaseLoader) instead of it.
See https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation
Fixes warning:
YAMLLoadWarning: calling yaml.load() without Loader=... is deprecated,
as the default Loader is unsafe. Please read https://msg.pyyaml.org/load for full details.
Upstream-Status: Submitted [https://github.com/tpm2-software/tpm2-tools/pull/1944]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
test/system/test_tpm2_activecredential.sh | 2 +-
test/system/test_tpm2_create.sh | 2 +-
test/system/test_tpm2_createprimary.sh | 2 +-
test/system/test_tpm2_nv.sh | 2 +-
test/system/test_tpm2_pcrevent.sh | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/system/test_tpm2_activecredential.sh b/test/system/test_tpm2_activecredential.sh
index d8cadf5..3c9cf6e 100755
--- a/test/system/test_tpm2_activecredential.sh
+++ b/test/system/test_tpm2_activecredential.sh
@@ -61,7 +61,7 @@ from __future__ import print_function
import yaml
with open('ak.out', 'r') as f:
- doc = yaml.load(f)
+ doc = yaml.load(f, Loader=yaml.BaseLoader)
print(doc['loaded-key']['name'])
pyscript`
diff --git a/test/system/test_tpm2_create.sh b/test/system/test_tpm2_create.sh
index d0bf031..ff192ca 100755
--- a/test/system/test_tpm2_create.sh
+++ b/test/system/test_tpm2_create.sh
@@ -59,7 +59,7 @@ import yaml
with open("$2") as f:
try:
- y = yaml.load(f)
+ y = yaml.load(f, Loader=yaml.BaseLoader)
found = "$1" in y
if (not found):
sys.stderr.write('Could not find index 0x%X\n' % ("$1"))
diff --git a/test/system/test_tpm2_createprimary.sh b/test/system/test_tpm2_createprimary.sh
index 83bdad4..cc4dce0 100755
--- a/test/system/test_tpm2_createprimary.sh
+++ b/test/system/test_tpm2_createprimary.sh
@@ -73,7 +73,7 @@ import yaml
with open("$2") as f:
try:
- y = yaml.load(f)
+ y = yaml.load(f, Loader=yaml.BaseLoader)
found = "$1" in y
if (not found):
sys.stderr.write('Could not find index 0x%X\n' % ("$1"))
diff --git a/test/system/test_tpm2_nv.sh b/test/system/test_tpm2_nv.sh
index 2db6522..756d7ea 100755
--- a/test/system/test_tpm2_nv.sh
+++ b/test/system/test_tpm2_nv.sh
@@ -69,7 +69,7 @@ import yaml
with open("$2") as f:
try:
- y = yaml.load(f)
+ y = yaml.load(f, Loader=yaml.BaseLoader)
found = $1 in y
if (not found):
sys.stderr.write('Could not find index 0x%X\n' % ($1))
diff --git a/test/system/test_tpm2_pcrevent.sh b/test/system/test_tpm2_pcrevent.sh
index 30ec932..74f640b 100755
--- a/test/system/test_tpm2_pcrevent.sh
+++ b/test/system/test_tpm2_pcrevent.sh
@@ -59,7 +59,7 @@ import yaml
with open("$1", 'r') as stream:
try:
- y = yaml.load(stream)
+ y = yaml.load(stream, Loader=yaml.BaseLoader)
alg = y["$2"]
value = alg[$3]
print(value)
--
2.7.4
meta-tpm2/recipes-tpm/tpm2-tools/files/0002-test-only-support-python3.patch
-141
View File
@@ -1,141 +0,0 @@
From 519e70785b56a10a6c326730cda90354ed48d2cb Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Wed, 11 Mar 2020 16:31:01 +0800
Subject: [PATCH] test: only support python3
The python2 is EOL and in some distributions (e.g. CentOS 8/RHEL 8),
there is no python symbolic link by default which will cause an error
when running the test scripts:
$ ./test_tpm2_activecredential.sh: line 66: python: command not found
See: https://developers.redhat.com/blog/2018/11/14/python-in-rhel-8/
So drop python2 support and only keep python3.
Upstream-Status: Submitted [https://github.com/tpm2-software/tpm2-tools/pull/1952]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
configure.ac | 19 ++++++++++---------
test/system/test_tpm2_activecredential.sh | 3 +--
test/system/test_tpm2_create.sh | 4 +---
test/system/test_tpm2_createprimary.sh | 4 +---
test/system/test_tpm2_nv.sh | 4 +---
test/system/test_tpm2_pcrevent.sh | 4 +---
6 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0bfd5196..129d37c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,24 +121,25 @@ AS_IF(
[],
[AC_MSG_WARN([Required executable bash not found, system tests require a bash shell!])])
-AC_CHECK_PROG([PYTHON],[python],[yes])
+AC_CHECK_PROG([PYTHON3],[python3],[yes])
AS_IF(
- [test "x${PYTHON}" = x"yes"],
+ [test "x${PYTHON3}" = x"yes"],
[],
- [AC_MSG_WARN([Required executable python not found, some system tests will fail!])])
+ [AC_MSG_WARN([Required executable python3 not found, some system tests will fail!])])
-dnl macro that checks for specific modules in python
-AC_DEFUN([AC_PYTHON_MODULE],
-[AC_MSG_CHECKING([for module $1 in python])
- echo "import $1" | python -
+dnl macro that checks for specific modules in python3
+AC_DEFUN([AC_PYTHON3_MODULE],
+[AC_MSG_CHECKING([for module $1 in python3])
+ echo "import $1" | python3 -
if test $? -ne 0 ; then
AC_MSG_RESULT([not found])
AC_MSG_WARN([System tests require pyyaml, some tests will fail!])
+ else
+ AC_MSG_RESULT(found)
fi
-AC_MSG_RESULT(found)
])
-AC_PYTHON_MODULE([yaml])
+AC_PYTHON3_MODULE([yaml])
AC_SUBST([EXTRA_CFLAGS])
AC_SUBST([EXTRA_LDFLAGS])
diff --git a/test/system/test_tpm2_activecredential.sh b/test/system/test_tpm2_activecredential.sh
index d8cadf53..f69576d1 100755
--- a/test/system/test_tpm2_activecredential.sh
+++ b/test/system/test_tpm2_activecredential.sh
@@ -56,8 +56,7 @@ tpm2_getpubek -Q -H 0x81010009 -g rsa -f ek.pub
tpm2_getpubak -E 0x81010009 -k 0x8101000a -g rsa -D sha256 -s rsassa -f ak.pub -n ak.name > ak.out
# Capture the yaml output and verify that its the same as the name output
-loaded_key_name_yaml=`python << pyscript
-from __future__ import print_function
+loaded_key_name_yaml=`python3 << pyscript
import yaml
with open('ak.out', 'r') as f:
diff --git a/test/system/test_tpm2_create.sh b/test/system/test_tpm2_create.sh
index d0bf0317..f31d6486 100755
--- a/test/system/test_tpm2_create.sh
+++ b/test/system/test_tpm2_create.sh
@@ -51,9 +51,7 @@ trap cleanup EXIT
function yaml_get() {
-python << pyscript
-from __future__ import print_function
-
+python3 << pyscript
import sys
import yaml
diff --git a/test/system/test_tpm2_createprimary.sh b/test/system/test_tpm2_createprimary.sh
index 83bdad44..a2590f68 100755
--- a/test/system/test_tpm2_createprimary.sh
+++ b/test/system/test_tpm2_createprimary.sh
@@ -65,9 +65,7 @@ done
function yaml_get() {
-python << pyscript
-from __future__ import print_function
-
+python3 << pyscript
import sys
import yaml
diff --git a/test/system/test_tpm2_nv.sh b/test/system/test_tpm2_nv.sh
index 2db6522a..5f72f264 100755
--- a/test/system/test_tpm2_nv.sh
+++ b/test/system/test_tpm2_nv.sh
@@ -61,9 +61,7 @@ trap onerror ERR
function yaml_get() {
-python << pyscript
-from __future__ import print_function
-
+python3 << pyscript
import sys
import yaml
diff --git a/test/system/test_tpm2_pcrevent.sh b/test/system/test_tpm2_pcrevent.sh
index 30ec9320..f382387d 100755
--- a/test/system/test_tpm2_pcrevent.sh
+++ b/test/system/test_tpm2_pcrevent.sh
@@ -50,9 +50,7 @@ trap cleanup EXIT
function yaml_get() {
-python << pyscript
-from __future__ import print_function
-
+python3 << pyscript
import sys
import yaml
--
2.17.1
meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools.inc
-14
View File
@@ -1,14 +0,0 @@
SUMMARY = "Tools for TPM2"
DESCRIPTION = "This project builds a set of command-line tools for \
interacting with a TPM (Trusted Platform Module) 2."
HOMEPAGE = "https://github.com/tpm2-software/tpm2-tools"
SECTION = "security/tpm"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=91b7c548d73ea16537799e8060cea819"
DEPENDS = " \
tpm2-abrmd openssl curl autoconf-archive-native \
tpm2-tss libtss2 libtss2-mu libtss2-tcti-device libtss2-tcti-mssim \
"
inherit autotools pkgconfig
meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_3.2.1.bb
-11
View File
@@ -1,11 +0,0 @@
include ${BPN}.inc
SRC_URI = "\
https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \
file://0001-test-fix-yaml.load-warning.patch \
file://0002-test-only-support-python3.patch \
"
SRC_URI[md5sum] = "17f22e9b47682f4601eb55324282ad6e"
SRC_URI[sha256sum] = "568ff32f99e0835db5d8cea2dce781b6cd6c1034026514240995dae5d9e728b0"
S = "${WORKDIR}/${BPN}-${PV}"
meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_4.1.1.bb
+17
View File
@@ -0,0 +1,17 @@
SUMMARY = "Tools for TPM2."
DESCRIPTION = "tpm2-tools"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=0eb1216e46938bd723098d93a23c3bcc"
SECTION = "tpm"
DEPENDS = "tpm2-abrmd tpm2-tss openssl curl autoconf-archive"
SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz"
SRC_URI[md5sum] = "701ae9e8c8cbdd37d89c8ad774f55395"
SRC_URI[sha256sum] = "40b9263d8b949bd2bc03a3cd60fa242e27116727467f9bbdd0b5f2539a25a7b1"
SRC_URI[sha1sum] = "d097d321237983435f05c974533ad90e6f20acef"
SRC_URI[sha384sum] = "396547f400e4f5626d7741d77ec543f312d94e6697899f4c36260d15fab3f4f971ad2c0487e6eaa2d60256f3cf68f85f"
SRC_URI[sha512sum] = "25952cf947f0acd16b1a8dbd3ac8573bce85ff970a7e24c290c4f9cd29418e77a3e48ac82c932fbd250887a9303ab301ff92db594c2fffaba47b873382444d26"
inherit autotools pkgconfig bash-completion
meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_git.bb
-26
View File
@@ -1,26 +0,0 @@
include ${BPN}.inc
DEFAULT_PREFERENCE = "-1"
PVBASE := "${PV}"
PV = "${PVBASE}.${SRCPV}"
SRC_URI = "git://github.com/tpm2-software/${BPN}.git;protocol=git;branch=master;name=${BPN};destsuffix=${BPN}"
def version_git(d):
version = d.getVar("PREFERRED_VERSION_%s" % d.getVar('PN'))
if version is not None and "git" in version:
return d.getVar("AUTOREV")
else:
return "e105149f07c9b944f69599ab67cd8b018ad880d2"
SRCREV ?= '${@version_git(d)}'
S = "${WORKDIR}/${BPN}"
do_configure_prepend () {
# execute the bootstrap script
currentdir=$(pwd)
cd ${S}
AUTORECONF=true ./bootstrap
cd ${currentdir}
}
meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch
-49
View File
@@ -1,49 +0,0 @@
From 91d71fb0b7316dedc18ab003954b2358008d8cde Mon Sep 17 00:00:00 2001
From: Jonas Witschel <diabonas@gmx.de>
Date: Mon, 7 Jan 2019 22:15:06 +0100
Subject: [PATCH] build: update for ax_code_coverage.m4 version 2019.01.06
@CODE_COVERAGE_RULES@ doesn't exist any more and needs to be replaced.
Also includes a compatibility switch for older versions of the file.
Upstream-Status: Backport [https://github.com/tpm2-software/tpm2-tss/commit/648fa841fa2f2bb6f8fdda02c36ac0abb45f5329]
Signed-off-by: Jonas Witschel <diabonas@gmx.de>
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
---
Makefile.am | 6 ++++++
configure.ac | 3 +++
2 files changed, 9 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index d78d23f..7815c4b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,13 @@ noinst_PROGRAMS =
### Add ax_* rules ###
# ax_code_coverage
+if AUTOCONF_CODE_COVERAGE_2019_01_06
+include $(top_srcdir)/aminclude_static.am
+clean-local: code-coverage-clean
+dist-clean-local: code-coverage-dist-clean
+else
@CODE_COVERAGE_RULES@
+endif
# ax_doxygen
@DX_RULES@
diff --git a/configure.ac b/configure.ac
index c8aa314..40883a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -312,6 +312,9 @@ AS_IF([test "x$enable_doxygen_doc" != xn
[ERROR_IF_NO_PROG([doxygen])])
AX_CODE_COVERAGE
+m4_ifdef([_AX_CODE_COVERAGE_RULES],
+ [AM_CONDITIONAL(AUTOCONF_CODE_COVERAGE_2019_01_06, [true])],
+ [AM_CONDITIONAL(AUTOCONF_CODE_COVERAGE_2019_01_06, [false])])
AC_OUTPUT
meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.2.3.bb
-11
View File
@@ -1,11 +0,0 @@
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da"
SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \
file://0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch \
"
SRC_URI[md5sum] = "593873bb023a0f8bcb93d12bc6640918"
SRC_URI[sha256sum] = "1369aee648b33128b9ee8e3ad87f5fc6dc37c2077b9f134223ea04f4809a99c3"
S = "${WORKDIR}/${BPN}-${PV}"
meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc → meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.3.2.bb
+35 -21
View File
@@ -1,26 +1,39 @@
SUMMARY = "The TCG TPM2 Software Stack"
DESCRIPTION = "The TCG (Trusted Computing Group) Software Stack (TSS) \
provides a standard API for accessing the functions of the TPM. \
Application developers can use this software to develop interoperable \
client applications."
HOMEPAGE = "https://github.com/tpm2-software/tpm2-tss"
SECTION = "security/tpm"
SUMMARY = "Software stack for TPM2."
DESCRIPTION = "OSS implementation of the TCG TPM2 Software Stack (TSS2) "
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=0b1d631c4218b72f6b05cb58613606f4"
LIC_FILES_CHKSUM = "file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da"
SECTION = "tpm"
DEPENDS = "autoconf-archive-native libgcrypt"
DEPENDS = "autoconf-archive-native libgcrypt openssl"
SRCREV = "a99e733ba66c359502689a9c42fd5e02ed1dd7d6"
SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz"
SRC_URI[md5sum] = "fb7e6d371959a65dc6d129af81739742"
SRC_URI[sha256sum] = "82929a0611f39246e09202702a61b54c980ab694626c1f5823520ddf75024fa6"
SRC_URI[sha1sum] = "c24ce8b20a8686ada775239389292f6d78020668"
SRC_URI[sha384sum] = "a0c023c024efb6c9906df1e143d692f44433de332b616dc0584c9b4cd4fb0ad544308f291892e91c5a52ef1a4b2abf7f"
SRC_URI[sha512sum] = "7b679b54f3478c3adee5b6c3135cbe491ffd9f4712991f465edbd6c7d2831e5f1537038ec36f288e9545c719d5d167b61116c924cf5d816220615d0b58a1d436"
inherit autotools pkgconfig systemd extrausers
PACKAGECONFIG ??= ""
PACKAGECONFIG[oxygen] = ",--disable-doxygen-doc, "
EXTRA_OECONF += "--enable-static --with-udevrulesdir=${base_prefix}/lib/udev/rules.d/"
EXTRA_OECONF_remove = " --disable-static"
EXTRA_USERS_PARAMS = "\
useradd -p '' tss; \
groupadd tss; \
"
PROVIDES = "${PACKAGES}"
inherit autotools pkgconfig
EXTRA_OECONF += " \
--with-udevrulesdir=${sysconfdir}/udev/rules.d \
--with-crypto=gcrypt \
--disable-doxygen-doc \
"
PACKAGES = " \
${PN} \
${PN}-dbg \
${PN}-doc \
libtss2-mu \
libtss2-mu-dev \
libtss2-mu-staticdev \
@@ -33,9 +46,6 @@ PACKAGES = " \
libtss2 \
libtss2-dev \
libtss2-staticdev \
${PN} \
${PN}-doc \
${PN}-dbg \
"
FILES_libtss2-tcti-device = "${libdir}/libtss2-tcti-device.so.*"
@@ -65,3 +75,7 @@ FILES_libtss2-dev = " \
${libdir}/pkgconfig \
${libdir}/libtss2*so"
FILES_libtss2-staticdev = "${libdir}/libtss*a"
FILES_${PN} = "${libdir}/udev ${base_prefix}/lib/udev"
RDEPENDS_libtss2 = "libgcrypt"
meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_git.bb
-29
View File
@@ -1,29 +0,0 @@
include ${BPN}.inc
DEFAULT_PREFERENCE = "-1"
PVBASE := "${PV}"
PV = "${PVBASE}.${SRCPV}"
SRC_URI = "git://github.com/tpm2-software/${BPN}.git;protocol=git;branch=master;name=${BPN};destsuffix=${BPN}"
def version_git(d):
version = d.getVar("PREFERRED_VERSION_%s" % d.getVar('PN'))
if version is not None and "git" in version:
return d.getVar("AUTOREV")
else:
return "35ab16e1d328f709d6146221a371b7341b84b670"
SRCREV ?= '${@version_git(d)}'
S = "${WORKDIR}/${BPN}"
do_configure_prepend () {
# Execute the bootstrap script, to generate src_vars.mk.
# The actual autotools bootstrapping is done by the normal
# do_configure, which does a better job with it (for example,
# it finds m4 macros also in the native sysroot).
currentdir="$(pwd)"
cd "${S}"
AUTORECONF=true ./bootstrap
cd "${currentdir}"
}