diff options
Diffstat (limited to 'meta-security/meta-tpm/recipes-tpm2')
-rw-r--r-- | meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.2.0.bb (renamed from meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.1.1.bb) | 3 | ||||
-rw-r--r-- | meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb | 2 | ||||
-rw-r--r-- | meta-security/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb | 4 | ||||
-rw-r--r-- | meta-security/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.2.bb (renamed from meta-security/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.1.bb) | 2 | ||||
-rw-r--r-- | meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.0.1.bb (renamed from meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.0.0.bb) | 2 | ||||
-rw-r--r-- | meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch | 84 | ||||
-rw-r--r-- | meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.3.1.bb (renamed from meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.2.3.bb) | 5 |
7 files changed, 8 insertions, 94 deletions
diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.1.1.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.2.0.bb index a4c66823f..021c96930 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.1.1.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.2.0.bb @@ -12,14 +12,13 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da" 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 = "06d9d433ba27159687255406baa37940db15465b" +SRCREV = "ac2a5a4b5a4e548177ed7a5b74cea23e00fd30b4" S = "${WORKDIR}/git" diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb index 222bb6d0e..218574999 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/tpm2-software/tpm2-pkcs11.git \ file://bootstrap_fixup.patch \ " -SRCREV = "9eed9df823a960da481327468a73d477241befdb" +SRCREV = "caf20c04651029626466c59d88b36c05cc6ea20b" S = "${WORKDIR}/git" diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb index e822e2974..f4918ec02 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb @@ -6,9 +6,9 @@ DEPENDS = "libtss2-dev gnu-efi-native gnu-efi pkgconfig autoconf-archive-native" SRC_URI = "git://github.com/tpm2-software/tpm2-tcti-uefi.git \ file://configure_oe_fixup.patch \ - file://0001-configure.ac-stop-inserting-host-directories-into-co.patch \ + file://0001-configure.ac-stop-inserting-host-directories-into-co.patch \ " -SRCREV = "7baf1eebfeb56a896bdd5d677fb24377d619eb9d" +SRCREV = "431c85f45dcdca5da003ed47c6e9814282476938" S = "${WORKDIR}/git" diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.1.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.2.bb index d47b7560d..8a2504d94 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.1.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.2.bb @@ -9,7 +9,7 @@ DEPENDS = "autoconf-archive libtss2-dev qrencode" PE = "1" -SRCREV = "2807a509a9da383e14dc0f759e71fd676db04ab1" +SRCREV = "15cc8fbc8fe71be9c04c3169ee1f70450d52a51a" SRC_URI = "git://github.com/tpm2-software/tpm2-totp.git;branch=v0.1.x \ file://litpm2_totp_build_fix.patch " diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.0.0.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.0.1.bb index 0a8d54f62..8825737ee 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.0.0.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.0.1.bb @@ -8,7 +8,7 @@ SECTION = "security/tpm" DEPENDS = "autoconf-archive-native bash-completion libtss2 libgcrypt openssl" -SRCREV = "a81d44a8610e28e5987af64f8aae16e4a2d09eaa" +SRCREV = "e1bbabe29377e45282d753a1b103625c420a19cf" SRC_URI = "git://github.com/tpm2-software/tpm2-tss-engine.git" inherit autotools-brokensep pkgconfig systemd diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch deleted file mode 100644 index 86b2cb6dd..000000000 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch +++ /dev/null @@ -1,84 +0,0 @@ -From ec08ab41495ac40641475707c46e844503ada5b3 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. - -Signed-off-by: Jonas Witschel <diabonas@gmx.de> ---- - .gitignore | 1 + - .travis.yml | 10 +++++----- - Makefile.am | 6 ++++++ - configure.ac | 3 +++ - 4 files changed, 15 insertions(+), 5 deletions(-) - -diff --git a/.gitignore b/.gitignore -index 7c6a7b62e6c1..aa1a7efdff71 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -26,6 +26,7 @@ - AUTHORS - tags - aclocal.m4 -+aminclude_static.am - autom4te.cache/ - [Bb]uild/ - [Dd]ebug/ -diff --git a/.travis.yml b/.travis.yml -index 55f88e22999b..a668e2953dc2 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -44,11 +44,11 @@ addons: - - install: - # Autoconf archive -- - wget https://download.01.org/tpm2/autoconf-archive-2017.09.28.tar.xz -- - sha256sum autoconf-archive-2017.09.28.tar.xz | grep -q 5c9fb5845b38b28982a3ef12836f76b35f46799ef4a2e46b48e2bd3c6182fa01 || travis_terminate 1 -- - tar xJf autoconf-archive-2017.09.28.tar.xz -- - cp autoconf-archive-2017.09.28/m4/ax_code_coverage.m4 m4/ -- - cp autoconf-archive-2017.09.28/m4/ax_prog_doxygen.m4 m4/ -+ - wget http://ftpmirror.gnu.org/autoconf-archive/autoconf-archive-2019.01.06.tar.xz -+ - sha256sum autoconf-archive-2019.01.06.tar.xz | grep -q 17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f || travis_terminate 1 -+ - tar xJf autoconf-archive-2019.01.06.tar.xz -+ - cp autoconf-archive-2019.01.06/m4/ax_code_coverage.m4 m4/ -+ - cp autoconf-archive-2019.01.06/m4/ax_prog_doxygen.m4 m4/ - # IBM-TPM - - wget https://download.01.org/tpm2/ibmtpm974.tar.gz - # OpenSSL 1.0.2 -diff --git a/Makefile.am b/Makefile.am -index 1b792d89a392..8e62e9c77c7d 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 6c7b0fd96399..22b79c50c015 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -312,6 +312,9 @@ AS_IF([test "x$enable_doxygen_doc" != xno], - [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 - --- -2.20.1 - diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.2.3.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.3.1.bb index ffbd3f4e4..3e77f71d2 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.2.3.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.3.1.bb @@ -6,10 +6,9 @@ SECTION = "tpm" DEPENDS = "autoconf-archive-native libgcrypt openssl" -SRCREV = "36b1539c82bf675265d6f6a6cd808a189b6971f4" +SRCREV = "a99e733ba66c359502689a9c42fd5e02ed1dd7d6" -SRC_URI = "git://github.com/tpm2-software/tpm2-tss.git;branch=2.2.x \ - file://0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch" +SRC_URI = "git://github.com/tpm2-software/tpm2-tss.git;branch=2.3.x" inherit autotools-brokensep pkgconfig systemd |