iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch Normal file
View File

@@ -0,0 +1,44 @@
From 158d0bc3a2a7a93090cc12c5b0dd3c27e6f44d61 Mon Sep 17 00:00:00 2001
From: Carlos Santos <unixmania@gmail.com>
Date: Mon, 23 Dec 2019 08:02:19 -0300
Subject: [PATCH] Temporary fix for build without C++
C++ is required only for the fuzzing tests but AC_PROG_CXX is included
by configure.ac even when fuzzing is not enabled (which we don't do on
Buildroot).
The patch applied upstream had issues and was reverted[1]. Use a local
patch to solve the problem temporaryly.
Fixes:
http://autobuild.buildroot.net/results/13f5e37b47b255da4158bec34e5459136f7e60d4
http://autobuild.buildroot.net/results/1c26db2509c79e00c0de1165945277eaa57b149f
http://autobuild.buildroot.net/results/b7b6b7b7aca79e847b442cbd2305427d91fe5d70
http://autobuild.buildroot.net/results/1cd5a82a0e799aa5027e2e2c03b246332cc3a15d
http://autobuild.buildroot.net/results/d7ec878907f714377c83e9a496e97cbf9382d787
http://autobuild.buildroot.net/results/1c7f0c1b3ce4871cd87bd6059b1f0a6dc4e74a9c
http://autobuild.buildroot.net/results/196b81d580325607c8da90beeb79e1f6b8ab8b47
http://autobuild.buildroot.net/results/f90f7b4ac710b56686635f8ae27059c11b963e47
1. https://github.com/tpm2-software/tpm2-tss/commit/60c26e4c4faba6ba12469485653e17092b510840
Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
configure.ac | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index cd50451d..a3bd7144 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,6 @@ AC_CANONICAL_HOST
AX_IS_RELEASE(dash-version)
AX_CHECK_ENABLE_DEBUG([info])
-AC_PROG_CXX
AC_PROG_CC
AC_PROG_LN_S
AC_USE_SYSTEM_EXTENSIONS
--
2.18.1

37
package/tpm2-tss/0001-tpm2b-types.c-fix-maybe-uninitialized-error.patch
View File

@@ -1,37 +0,0 @@
From 815f2bcbdfe5d9aff2cd3acbbb105daf1f5e9d7f Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Thu, 7 Feb 2019 09:58:07 +0100
Subject: [PATCH] tpm2b-types.c: fix maybe-uninitialized error
src/tss2-mu/tpm2b-types.c: In function 'Tss2_MU_TPM2B_ECC_POINT_Marshal':
src/tss2-mu/tpm2b-types.c:201:24: error: 'ptr' may be used uninitialized in this function [-Werror=maybe-uninitialized]
*(UINT16 *)ptr = HOST_TO_BE_16(buffer + local_offset - ptr - 2); \
^
src/tss2-mu/tpm2b-types.c:152:12: note: 'ptr' was declared here
UINT8 *ptr; \
Fixes:
- http://autobuild.buildroot.org/results/8d7b6dad6602fe67338abc696bc4752dda8e9717
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/tpm2-software/tpm2-tss/pull/1265]
---
src/tss2-mu/tpm2b-types.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tss2-mu/tpm2b-types.c b/src/tss2-mu/tpm2b-types.c
index 9c1003ab..7632febb 100644
--- a/src/tss2-mu/tpm2b-types.c
+++ b/src/tss2-mu/tpm2b-types.c
@@ -150,7 +150,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \
size_t buffer_size, size_t *offset) \
{ \
size_t local_offset = 0; \
- UINT8 *ptr; \
+ UINT8 *ptr = NULL; \
TSS2_RC rc; \
\
if (src == NULL) { \
--
2.14.1

4
package/tpm2-tss/tpm2-tss.hash
View File

@@ -1,3 +1,3 @@
# Locally computed:
sha256 bddfa4ab2ceb6394bcacf7db5d6419cbfabdb22702b6df75c59e60dd5f3fafb5 tpm2-tss-2.1.3.tar.gz
sha256 f7da3c2da12cec3348bb7ee9e2a9e651a241450b2efb67da29d5a75ef2da058a LICENSE
sha256 9d8c8866829e3ff5e1649ecd82498cb1329e0691139458e53b69e6061febe3d3 tpm2-tss-2.3.3.tar.gz
sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE

24
package/tpm2-tss/tpm2-tss.mk
View File

@@ -4,20 +4,26 @@
#
################################################################################
TPM2_TSS_VERSION = 2.1.3
TPM2_TSS_VERSION = 2.3.3
TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)
TPM2_TSS_LICENSE = BSD-2-Clause
TPM2_TSS_LICENSE_FILES = LICENSE
TPM2_TSS_INSTALL_STAGING = YES
TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf
TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc
TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc --disable-defaultflags
# 0001-configure-Only-use-CXX-when-fuzzing.patch
TPM2_TSS_AUTORECONF = YES
# -fstack-protector-all and FORTIFY_SOURCE=2 is used by
# default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options
# in the toolchain wrapper and CFLAGS are used instead
TPM2_TSS_CONF_ENV = \
ax_cv_check_cflags___________Wall__Werror_______fstack_protector_all=no \
ax_cv_check_ccppflags___________Wall__Werror_______U_FORTIFY_SOURCE=no \
ax_cv_check_ccppflags___________Wall__Werror_______D_FORTIFY_SOURCE_2=no
# uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used
TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99"
# The 2.3.3 tarball accidently contains a Makefile-fuzz-generated.am
# with content from a fuzz testing run rather than an empty file,
# confusing autoreconf with
# 0001-configure-Only-use-CXX-when-fuzzing.patch
define TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM
truncate -s 0 $(@D)/Makefile-fuzz-generated.am
endef
TPM2_TSS_POST_PATCH_HOOKS += TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM
$(eval $(autotools-package))