summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLans Zhang <jia.zhang@windriver.com>2017-07-20 15:50:46 +0800
committerLans Zhang <jia.zhang@windriver.com>2017-07-20 15:50:46 +0800
commit9b7c0d98caa57706db4f0a38151b18961adc0faa (patch)
tree4cf1b86eabe770e19e4ce2e987ab15a07e0012ee
parente8aee2ab910672ac4ef3dcc8d31ca87511762b0b (diff)
downloadmeta-secure-core-9b7c0d98caa57706db4f0a38151b18961adc0faa.tar.gz
tpm2.0-tss: update to the latest and code style fixup
Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
Diffstat
-rw-r--r--meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/0001-update-bootstrap.patch24
-rw-r--r--meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_check_compile_flag.m474
-rw-r--r--meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_check_link_flag.m474
-rw-r--r--meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_check_preproc_flag.m474
-rw-r--r--meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4332
-rw-r--r--meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/no-cmocka-configure-ac.diff10
-rw-r--r--meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb99
7 files changed, 45 insertions, 642 deletions
diff --git a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/0001-update-bootstrap.patch b/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/0001-update-bootstrap.patch
deleted file mode 100644
index 3f5fa81..0000000
--- a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/0001-update-bootstrap.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Index: TPM2.0-TSS/bootstrap
2===================================================================
3--- TPM2.0-TSS.orig/bootstrap
4+++ TPM2.0-TSS/bootstrap
5@@ -13,6 +13,7 @@ src_listvar () {
6 }
7
8 VARS_FILE=src_vars.mk
9+AUTORECONF=${AUTORECONF:-autoreconf}
10
11 echo "Generating file lists: ${VARS_FILE}"
12 (
13@@ -30,11 +31,3 @@ echo "Generating file lists: ${VARS_FILE
14 printf "SAMPLE_SRC = \$(SAMPLE_C) \$(SAMPLE_H)\n"
15 ) > ${VARS_FILE}
16
17-printf "Running libtoolize ...\n"
18-libtoolize --install
19-printf "Running aclocal ...\n"
20-aclocal
21-printf "Running autoconf ...\n"
22-autoconf
23-printf "Running automake ...\n"
24-automake --add-missing
diff --git a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_check_compile_flag.m4 b/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_check_compile_flag.m4
deleted file mode 100644
index dcabb92..0000000
--- a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_check_compile_flag.m4
+++ /dev/null
@@ -1,74 +0,0 @@
1# ===========================================================================
2# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
3# ===========================================================================
4#
5# SYNOPSIS
6#
7# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
8#
9# DESCRIPTION
10#
11# Check whether the given FLAG works with the current language's compiler
12# or gives an error. (Warnings, however, are ignored)
13#
14# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
15# success/failure.
16#
17# If EXTRA-FLAGS is defined, it is added to the current language's default
18# flags (e.g. CFLAGS) when the check is done. The check is thus made with
19# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
20# force the compiler to issue an error when a bad flag is given.
21#
22# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
23#
24# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
25# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
26#
27# LICENSE
28#
29# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
30# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
31#
32# This program is free software: you can redistribute it and/or modify it
33# under the terms of the GNU General Public License as published by the
34# Free Software Foundation, either version 3 of the License, or (at your
35# option) any later version.
36#
37# This program is distributed in the hope that it will be useful, but
38# WITHOUT ANY WARRANTY; without even the implied warranty of
39# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
40# Public License for more details.
41#
42# You should have received a copy of the GNU General Public License along
43# with this program. If not, see <https://www.gnu.org/licenses/>.
44#
45# As a special exception, the respective Autoconf Macro's copyright owner
46# gives unlimited permission to copy, distribute and modify the configure
47# scripts that are the output of Autoconf when processing the Macro. You
48# need not follow the terms of the GNU General Public License when using
49# or distributing such scripts, even though portions of the text of the
50# Macro appear in them. The GNU General Public License (GPL) does govern
51# all other use of the material that constitutes the Autoconf Macro.
52#
53# This special exception to the GPL applies to versions of the Autoconf
54# Macro released by the Autoconf Archive. When you make and distribute a
55# modified version of the Autoconf Macro, you may extend this special
56# exception to the GPL to apply to your modified version as well.
57
58#serial 5
59
60AC_DEFUN([AX_CHECK_COMPILE_FLAG],
61[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
62AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
63AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
64 ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
65 _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
66 AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
67 [AS_VAR_SET(CACHEVAR,[yes])],
68 [AS_VAR_SET(CACHEVAR,[no])])
69 _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
70AS_VAR_IF(CACHEVAR,yes,
71 [m4_default([$2], :)],
72 [m4_default([$3], :)])
73AS_VAR_POPDEF([CACHEVAR])dnl
74])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_check_link_flag.m4 b/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_check_link_flag.m4
deleted file mode 100644
index 819409a..0000000
--- a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_check_link_flag.m4
+++ /dev/null
@@ -1,74 +0,0 @@
1# ===========================================================================
2# https://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
3# ===========================================================================
4#
5# SYNOPSIS
6#
7# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
8#
9# DESCRIPTION
10#
11# Check whether the given FLAG works with the linker or gives an error.
12# (Warnings, however, are ignored)
13#
14# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
15# success/failure.
16#
17# If EXTRA-FLAGS is defined, it is added to the linker's default flags
18# when the check is done. The check is thus made with the flags: "LDFLAGS
19# EXTRA-FLAGS FLAG". This can for example be used to force the linker to
20# issue an error when a bad flag is given.
21#
22# INPUT gives an alternative input source to AC_LINK_IFELSE.
23#
24# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
25# macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
26#
27# LICENSE
28#
29# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
30# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
31#
32# This program is free software: you can redistribute it and/or modify it
33# under the terms of the GNU General Public License as published by the
34# Free Software Foundation, either version 3 of the License, or (at your
35# option) any later version.
36#
37# This program is distributed in the hope that it will be useful, but
38# WITHOUT ANY WARRANTY; without even the implied warranty of
39# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
40# Public License for more details.
41#
42# You should have received a copy of the GNU General Public License along
43# with this program. If not, see <https://www.gnu.org/licenses/>.
44#
45# As a special exception, the respective Autoconf Macro's copyright owner
46# gives unlimited permission to copy, distribute and modify the configure
47# scripts that are the output of Autoconf when processing the Macro. You
48# need not follow the terms of the GNU General Public License when using
49# or distributing such scripts, even though portions of the text of the
50# Macro appear in them. The GNU General Public License (GPL) does govern
51# all other use of the material that constitutes the Autoconf Macro.
52#
53# This special exception to the GPL applies to versions of the Autoconf
54# Macro released by the Autoconf Archive. When you make and distribute a
55# modified version of the Autoconf Macro, you may extend this special
56# exception to the GPL to apply to your modified version as well.
57
58#serial 5
59
60AC_DEFUN([AX_CHECK_LINK_FLAG],
61[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
62AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
63AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
64 ax_check_save_flags=$LDFLAGS
65 LDFLAGS="$LDFLAGS $4 $1"
66 AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
67 [AS_VAR_SET(CACHEVAR,[yes])],
68 [AS_VAR_SET(CACHEVAR,[no])])
69 LDFLAGS=$ax_check_save_flags])
70AS_VAR_IF(CACHEVAR,yes,
71 [m4_default([$2], :)],
72 [m4_default([$3], :)])
73AS_VAR_POPDEF([CACHEVAR])dnl
74])dnl AX_CHECK_LINK_FLAGS
diff --git a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_check_preproc_flag.m4 b/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_check_preproc_flag.m4
deleted file mode 100644
index 4850ff3..0000000
--- a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_check_preproc_flag.m4
+++ /dev/null
@@ -1,74 +0,0 @@
1# ===========================================================================
2# https://www.gnu.org/software/autoconf-archive/ax_check_preproc_flag.html
3# ===========================================================================
4#
5# SYNOPSIS
6#
7# AX_CHECK_PREPROC_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
8#
9# DESCRIPTION
10#
11# Check whether the given FLAG works with the current language's
12# preprocessor or gives an error. (Warnings, however, are ignored)
13#
14# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
15# success/failure.
16#
17# If EXTRA-FLAGS is defined, it is added to the preprocessor's default
18# flags when the check is done. The check is thus made with the flags:
19# "CPPFLAGS EXTRA-FLAGS FLAG". This can for example be used to force the
20# preprocessor to issue an error when a bad flag is given.
21#
22# INPUT gives an alternative input source to AC_PREPROC_IFELSE.
23#
24# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
25# macro in sync with AX_CHECK_{COMPILE,LINK}_FLAG.
26#
27# LICENSE
28#
29# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
30# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
31#
32# This program is free software: you can redistribute it and/or modify it
33# under the terms of the GNU General Public License as published by the
34# Free Software Foundation, either version 3 of the License, or (at your
35# option) any later version.
36#
37# This program is distributed in the hope that it will be useful, but
38# WITHOUT ANY WARRANTY; without even the implied warranty of
39# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
40# Public License for more details.
41#
42# You should have received a copy of the GNU General Public License along
43# with this program. If not, see <https://www.gnu.org/licenses/>.
44#
45# As a special exception, the respective Autoconf Macro's copyright owner
46# gives unlimited permission to copy, distribute and modify the configure
47# scripts that are the output of Autoconf when processing the Macro. You
48# need not follow the terms of the GNU General Public License when using
49# or distributing such scripts, even though portions of the text of the
50# Macro appear in them. The GNU General Public License (GPL) does govern
51# all other use of the material that constitutes the Autoconf Macro.
52#
53# This special exception to the GPL applies to versions of the Autoconf
54# Macro released by the Autoconf Archive. When you make and distribute a
55# modified version of the Autoconf Macro, you may extend this special
56# exception to the GPL to apply to your modified version as well.
57
58#serial 5
59
60AC_DEFUN([AX_CHECK_PREPROC_FLAG],
61[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
62AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]cppflags_$4_$1])dnl
63AC_CACHE_CHECK([whether _AC_LANG preprocessor accepts $1], CACHEVAR, [
64 ax_check_save_flags=$CPPFLAGS
65 CPPFLAGS="$CPPFLAGS $4 $1"
66 AC_PREPROC_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
67 [AS_VAR_SET(CACHEVAR,[yes])],
68 [AS_VAR_SET(CACHEVAR,[no])])
69 CPPFLAGS=$ax_check_save_flags])
70AS_VAR_IF(CACHEVAR,yes,
71 [m4_default([$2], :)],
72 [m4_default([$3], :)])
73AS_VAR_POPDEF([CACHEVAR])dnl
74])dnl AX_CHECK_PREPROC_FLAGS
diff --git a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4 b/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4
deleted file mode 100644
index d383ad5..0000000
--- a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4
+++ /dev/null
@@ -1,332 +0,0 @@
1# ===========================================================================
2# http://www.gnu.org/software/autoconf-archive/ax_pthread.html
3# ===========================================================================
4#
5# SYNOPSIS
6#
7# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
8#
9# DESCRIPTION
10#
11# This macro figures out how to build C programs using POSIX threads. It
12# sets the PTHREAD_LIBS output variable to the threads library and linker
13# flags, and the PTHREAD_CFLAGS output variable to any special C compiler
14# flags that are needed. (The user can also force certain compiler
15# flags/libs to be tested by setting these environment variables.)
16#
17# Also sets PTHREAD_CC to any special C compiler that is needed for
18# multi-threaded programs (defaults to the value of CC otherwise). (This
19# is necessary on AIX to use the special cc_r compiler alias.)
20#
21# NOTE: You are assumed to not only compile your program with these flags,
22# but also link it with them as well. e.g. you should link with
23# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
24#
25# If you are only building threads programs, you may wish to use these
26# variables in your default LIBS, CFLAGS, and CC:
27#
28# LIBS="$PTHREAD_LIBS $LIBS"
29# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
30# CC="$PTHREAD_CC"
31#
32# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
33# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
34# (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
35#
36# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
37# PTHREAD_PRIO_INHERIT symbol is defined when compiling with
38# PTHREAD_CFLAGS.
39#
40# ACTION-IF-FOUND is a list of shell commands to run if a threads library
41# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
42# is not found. If ACTION-IF-FOUND is not specified, the default action
43# will define HAVE_PTHREAD.
44#
45# Please let the authors know if this macro fails on any platform, or if
46# you have any other suggestions or comments. This macro was based on work
47# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
48# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
49# Alejandro Forero Cuervo to the autoconf macro repository. We are also
50# grateful for the helpful feedback of numerous users.
51#
52# Updated for Autoconf 2.68 by Daniel Richard G.
53#
54# LICENSE
55#
56# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
57# Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
58#
59# This program is free software: you can redistribute it and/or modify it
60# under the terms of the GNU General Public License as published by the
61# Free Software Foundation, either version 3 of the License, or (at your
62# option) any later version.
63#
64# This program is distributed in the hope that it will be useful, but
65# WITHOUT ANY WARRANTY; without even the implied warranty of
66# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
67# Public License for more details.
68#
69# You should have received a copy of the GNU General Public License along
70# with this program. If not, see <http://www.gnu.org/licenses/>.
71#
72# As a special exception, the respective Autoconf Macro's copyright owner
73# gives unlimited permission to copy, distribute and modify the configure
74# scripts that are the output of Autoconf when processing the Macro. You
75# need not follow the terms of the GNU General Public License when using
76# or distributing such scripts, even though portions of the text of the
77# Macro appear in them. The GNU General Public License (GPL) does govern
78# all other use of the material that constitutes the Autoconf Macro.
79#
80# This special exception to the GPL applies to versions of the Autoconf
81# Macro released by the Autoconf Archive. When you make and distribute a
82# modified version of the Autoconf Macro, you may extend this special
83# exception to the GPL to apply to your modified version as well.
84
85#serial 21
86
87AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
88AC_DEFUN([AX_PTHREAD], [
89AC_REQUIRE([AC_CANONICAL_HOST])
90AC_LANG_PUSH([C])
91ax_pthread_ok=no
92
93# We used to check for pthread.h first, but this fails if pthread.h
94# requires special compiler flags (e.g. on True64 or Sequent).
95# It gets checked for in the link test anyway.
96
97# First of all, check if the user has set any of the PTHREAD_LIBS,
98# etcetera environment variables, and if threads linking works using
99# them:
100if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
101 save_CFLAGS="$CFLAGS"
102 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
103 save_LIBS="$LIBS"
104 LIBS="$PTHREAD_LIBS $LIBS"
105 AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
106 AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
107 AC_MSG_RESULT([$ax_pthread_ok])
108 if test x"$ax_pthread_ok" = xno; then
109 PTHREAD_LIBS=""
110 PTHREAD_CFLAGS=""
111 fi
112 LIBS="$save_LIBS"
113 CFLAGS="$save_CFLAGS"
114fi
115
116# We must check for the threads library under a number of different
117# names; the ordering is very important because some systems
118# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
119# libraries is broken (non-POSIX).
120
121# Create a list of thread flags to try. Items starting with a "-" are
122# C compiler flags, and other items are library names, except for "none"
123# which indicates that we try without any flags at all, and "pthread-config"
124# which is a program returning the flags for the Pth emulation library.
125
126ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
127
128# The ordering *is* (sometimes) important. Some notes on the
129# individual items follow:
130
131# pthreads: AIX (must check this before -lpthread)
132# none: in case threads are in libc; should be tried before -Kthread and
133# other compiler flags to prevent continual compiler warnings
134# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
135# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
136# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
137# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
138# -pthreads: Solaris/gcc
139# -mthreads: Mingw32/gcc, Lynx/gcc
140# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
141# doesn't hurt to check since this sometimes defines pthreads too;
142# also defines -D_REENTRANT)
143# ... -mt is also the pthreads flag for HP/aCC
144# pthread: Linux, etcetera
145# --thread-safe: KAI C++
146# pthread-config: use pthread-config program (for GNU Pth library)
147
148case ${host_os} in
149 solaris*)
150
151 # On Solaris (at least, for some versions), libc contains stubbed
152 # (non-functional) versions of the pthreads routines, so link-based
153 # tests will erroneously succeed. (We need to link with -pthreads/-mt/
154 # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
155 # a function called by this macro, so we could check for that, but
156 # who knows whether they'll stub that too in a future libc.) So,
157 # we'll just look for -pthreads and -lpthread first:
158
159 ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
160 ;;
161
162 darwin*)
163 ax_pthread_flags="-pthread $ax_pthread_flags"
164 ;;
165esac
166
167# Clang doesn't consider unrecognized options an error unless we specify
168# -Werror. We throw in some extra Clang-specific options to ensure that
169# this doesn't happen for GCC, which also accepts -Werror.
170
171AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
172save_CFLAGS="$CFLAGS"
173ax_pthread_extra_flags="-Werror"
174CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
175AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
176 [AC_MSG_RESULT([yes])],
177 [ax_pthread_extra_flags=
178 AC_MSG_RESULT([no])])
179CFLAGS="$save_CFLAGS"
180
181if test x"$ax_pthread_ok" = xno; then
182for flag in $ax_pthread_flags; do
183
184 case $flag in
185 none)
186 AC_MSG_CHECKING([whether pthreads work without any flags])
187 ;;
188
189 -*)
190 AC_MSG_CHECKING([whether pthreads work with $flag])
191 PTHREAD_CFLAGS="$flag"
192 ;;
193
194 pthread-config)
195 AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
196 if test x"$ax_pthread_config" = xno; then continue; fi
197 PTHREAD_CFLAGS="`pthread-config --cflags`"
198 PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
199 ;;
200
201 *)
202 AC_MSG_CHECKING([for the pthreads library -l$flag])
203 PTHREAD_LIBS="-l$flag"
204 ;;
205 esac
206
207 save_LIBS="$LIBS"
208 save_CFLAGS="$CFLAGS"
209 LIBS="$PTHREAD_LIBS $LIBS"
210 CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
211
212 # Check for various functions. We must include pthread.h,
213 # since some functions may be macros. (On the Sequent, we
214 # need a special flag -Kthread to make this header compile.)
215 # We check for pthread_join because it is in -lpthread on IRIX
216 # while pthread_create is in libc. We check for pthread_attr_init
217 # due to DEC craziness with -lpthreads. We check for
218 # pthread_cleanup_push because it is one of the few pthread
219 # functions on Solaris that doesn't have a non-functional libc stub.
220 # We try pthread_create on general principles.
221 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
222 static void routine(void *a) { a = 0; }
223 static void *start_routine(void *a) { return a; }],
224 [pthread_t th; pthread_attr_t attr;
225 pthread_create(&th, 0, start_routine, 0);
226 pthread_join(th, 0);
227 pthread_attr_init(&attr);
228 pthread_cleanup_push(routine, 0);
229 pthread_cleanup_pop(0) /* ; */])],
230 [ax_pthread_ok=yes],
231 [])
232
233 LIBS="$save_LIBS"
234 CFLAGS="$save_CFLAGS"
235
236 AC_MSG_RESULT([$ax_pthread_ok])
237 if test "x$ax_pthread_ok" = xyes; then
238 break;
239 fi
240
241 PTHREAD_LIBS=""
242 PTHREAD_CFLAGS=""
243done
244fi
245
246# Various other checks:
247if test "x$ax_pthread_ok" = xyes; then
248 save_LIBS="$LIBS"
249 LIBS="$PTHREAD_LIBS $LIBS"
250 save_CFLAGS="$CFLAGS"
251 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
252
253 # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
254 AC_MSG_CHECKING([for joinable pthread attribute])
255 attr_name=unknown
256 for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
257 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
258 [int attr = $attr; return attr /* ; */])],
259 [attr_name=$attr; break],
260 [])
261 done
262 AC_MSG_RESULT([$attr_name])
263 if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
264 AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
265 [Define to necessary symbol if this constant
266 uses a non-standard name on your system.])
267 fi
268
269 AC_MSG_CHECKING([if more special flags are required for pthreads])
270 flag=no
271 case ${host_os} in
272 aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
273 osf* | hpux*) flag="-D_REENTRANT";;
274 solaris*)
275 if test "$GCC" = "yes"; then
276 flag="-D_REENTRANT"
277 else
278 # TODO: What about Clang on Solaris?
279 flag="-mt -D_REENTRANT"
280 fi
281 ;;
282 esac
283 AC_MSG_RESULT([$flag])
284 if test "x$flag" != xno; then
285 PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
286 fi
287
288 AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
289 [ax_cv_PTHREAD_PRIO_INHERIT], [
290 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
291 [[int i = PTHREAD_PRIO_INHERIT;]])],
292 [ax_cv_PTHREAD_PRIO_INHERIT=yes],
293 [ax_cv_PTHREAD_PRIO_INHERIT=no])
294 ])
295 AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
296 [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
297
298 LIBS="$save_LIBS"
299 CFLAGS="$save_CFLAGS"
300
301 # More AIX lossage: compile with *_r variant
302 if test "x$GCC" != xyes; then
303 case $host_os in
304 aix*)
305 AS_CASE(["x/$CC"],
306 [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
307 [#handle absolute path differently from PATH based program lookup
308 AS_CASE(["x$CC"],
309 [x/*],
310 [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
311 [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
312 ;;
313 esac
314 fi
315fi
316
317test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
318
319AC_SUBST([PTHREAD_LIBS])
320AC_SUBST([PTHREAD_CFLAGS])
321AC_SUBST([PTHREAD_CC])
322
323# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
324if test x"$ax_pthread_ok" = xyes; then
325 ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
326 :
327else
328 ax_pthread_ok=no
329 $2
330fi
331AC_LANG_POP
332])dnl AX_PTHREAD
diff --git a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/no-cmocka-configure-ac.diff b/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/no-cmocka-configure-ac.diff
deleted file mode 100644
index 9e5f2f5..0000000
--- a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss/no-cmocka-configure-ac.diff
+++ /dev/null
@@ -1,10 +0,0 @@
1Index: TPM2.0-TSS/configure.ac
2===================================================================
3--- TPM2.0-TSS.orig/configure.ac
4+++ TPM2.0-TSS/configure.ac
5@@ -11,5 +11,4 @@ AX_PTHREAD([], [AC_MSG_ERROR([requires p
6 AM_INIT_AUTOMAKE([foreign
7 subdir-objects])
8 AC_CONFIG_FILES([Makefile])
9-PKG_CHECK_MODULES([CMOCKA],[cmocka])
10 AC_OUTPUT
diff --git a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb b/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb
index cda3b30..7c9f5a9 100644
--- a/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb
+++ b/meta-tpm2/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb
@@ -1,39 +1,39 @@
1SUMMARY = "Software stack for TPM2." 1SUMMARY = "Software stack for TPM2."
2DESCRIPTION = "tpm2.0-tss like woah." 2DESCRIPTION = "tpm2.0-tss like woah."
3SECTION = "tpm" 3SECTION = "security/tpm"
4 4
5# This is a lie. The source for this project is covered by several licenses. 5LICENSE = "BSD-2-Clause"
6# We're currently working on a way to make this clear for those consuming the 6LIC_FILES_CHKSUM = "file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da"
7# project. Till then I'm using 'BSD' as a place holder since the Intel license
8# is "BSD-like".
9LICENSE = "BSD"
10LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb"
11 7
12# This doesn't seem to work. Keeping it here for completeness. Remove once
13# it's fixed upstream.
14DEPENDS += "autoconf-archive pkgconfig" 8DEPENDS += "autoconf-archive pkgconfig"
15#RDEPENDS_libtss2 += "libmarshal"
16#RDEPENDS_libtctidevice += "libmarshal"
17 9
18SRC_URI = " \ 10PV = "1.1.0+git${SRCPV}"
19 git://github.com/01org/TPM2.0-TSS.git;protocol=http;branch=1.x;name=TPM2.0-TSS;destsuffix=TPM2.0-TSS \ 11
12SRC_URI = "\
13 git://github.com/01org/TPM2.0-TSS.git \
20" 14"
15SRCREV = "3fb91634e61c97a0ae732bc5c298b188c23376cf"
21 16
22# CAPS? SRSLY? 17S = "${WORKDIR}/git"
23S = "${WORKDIR}/${@d.getVar('BPN',d).upper()}"
24 18
25SRCREV = "1fa2f4d12449d5d639032fee28d922fe9d4877b5" 19inherit autotools pkgconfig systemd
26PV = "1.1.0+git${SRCPV}"
27 20
28RRECOMMENDS_${PN} += "\ 21INHERIT += "extrausers"
29 kernel-module-tpm-crb \ 22EXTRA_USERS_PARAMS = "\
30 kernel-module-tpm-tis \ 23 useradd -p '' tss; \
24 groupadd tss; \
31" 25"
32 26
33TPM_DESCRIPTION = 'device/description' 27do_configure_prepend() {
34FAMILY_MAJOR = 'TPM 2.0' 28 # execute the bootstrap script
29 currentdir="$(pwd)"
30 cd "${S}"
31 ACLOCAL="aclocal --system-acdir=${STAGING_DATADIR}/aclocal" \
32 ./bootstrap --force
33 cd "${currentdir}"
34}
35 35
36PACKAGES = " \ 36PACKAGES = "\
37 ${PN}-dbg \ 37 ${PN}-dbg \
38 libtss2 \ 38 libtss2 \
39 libtss2-dev \ 39 libtss2-dev \
@@ -51,59 +51,50 @@ PACKAGES = " \
51" 51"
52 52
53FILES_libtss2 = "${libdir}/libsapi.so.*" 53FILES_libtss2 = "${libdir}/libsapi.so.*"
54FILES_libtss2-dev = " \ 54FILES_libtss2-dev = "\
55 ${includedir}/sapi \ 55 ${includedir}/sapi \
56 ${includedir}/tcti/common.h \ 56 ${includedir}/tcti/common.h \
57 ${libdir}/libsapi.so \ 57 ${libdir}/libsapi.so \
58 ${libdir}/pkgconfig/sapi.pc \ 58 ${libdir}/pkgconfig/sapi.pc \
59 ${libdir}/libsapi.la \
60" 59"
61FILES_libtss2-staticdev = " \ 60FILES_libtss2-staticdev = "\
62 ${libdir}/libsapi.a \ 61 ${libdir}/libsapi.a \
62 ${libdir}/libsapi.la \
63" 63"
64FILES_libtss2-doc = " \ 64FILES_libtss2-doc = "\
65 ${mandir} \ 65 ${mandir} \
66" 66"
67FILES_libtctidevice = "${libdir}/libtcti-device.so.*" 67FILES_libtctidevice = "${libdir}/libtcti-device.so.*"
68FILES_libtctidevice-dev = " \ 68FILES_libtctidevice-dev = "\
69 ${includedir}/tcti/tcti_device.h \ 69 ${includedir}/tcti/tcti_device.h \
70 ${libdir}/libtcti-device.so \ 70 ${libdir}/libtcti-device.so \
71 ${libdir}/pkgconfig/tcti-device.pc \ 71 ${libdir}/pkgconfig/tcti-device.pc \
72"
73FILES_libtctidevice-staticdev = "\
74 ${libdir}/libtcti-device.a \
72 ${libdir}/libtcti-device.la \ 75 ${libdir}/libtcti-device.la \
73" 76"
74FILES_libtctidevice-staticdev = "${libdir}/libtcti-device.a"
75FILES_libtctisocket = "${libdir}/libtcti-socket.so.*" 77FILES_libtctisocket = "${libdir}/libtcti-socket.so.*"
76FILES_libtctisocket-dev = " \ 78FILES_libtctisocket-dev = "\
77 ${includedir}/tcti/tcti_socket.h \ 79 ${includedir}/tcti/tcti_socket.h \
78 ${libdir}/libtcti-socket.so \ 80 ${libdir}/libtcti-socket.so \
79 ${libdir}/pkgconfig/tcti-socket.pc \ 81 ${libdir}/pkgconfig/tcti-socket.pc \
82"
83FILES_libtctisocket-staticdev = "\
84 ${libdir}/libtcti-socket.a \
80 ${libdir}/libtcti-socket.la \ 85 ${libdir}/libtcti-socket.la \
81" 86"
82FILES_libtctisocket-staticdev = "${libdir}/libtcti-socket.a"
83FILES_libmarshal = "${libdir}/libmarshal.so.*" 87FILES_libmarshal = "${libdir}/libmarshal.so.*"
84FILES_libmarshal-dev = "${libdir}/libmarshal.la ${libdir}/libmarshal.so" 88FILES_libmarshal-dev = "${libdir}/libmarshal.so"
85FILES_libmarshal-staticdev = "${libdir}/libmarshal.a" 89FILES_libmarshal-staticdev = "\
90 ${libdir}/libmarshal.a \
91 ${libdir}/libmarshal.la \
92"
86 93
87inherit autotools 94RDEPENDS_libtss2 += "libmarshal"
95RDEPENDS_libtctidevice += "libmarshal"
88 96
89# the autotools / autoconf-archive don't work as expected so we include the 97RRECOMMENDS_${PN} += "\
90# pthread macro ourselves for now 98 kernel-module-tpm-crb \
91SRC_URI += " \ 99 kernel-module-tpm-tis \
92 file://ax_pthread.m4 \
93 file://ax_check_compile_flag.m4 \
94 file://ax_check_preproc_flag.m4 \
95 file://ax_check_link_flag.m4 \
96" 100"
97do_configure_prepend () {
98 mkdir -p ${S}/m4
99 cp ${WORKDIR}/ax_pthread.m4 ${S}/m4
100 cp ${WORKDIR}/ax_check_compile_flag.m4 ${S}/m4
101 cp ${WORKDIR}/ax_check_preproc_flag.m4 ${S}/m4
102 cp ${WORKDIR}/ax_check_link_flag.m4 ${S}/m4
103 # execute the bootstrap script
104 currentdir=$(pwd)
105 cd ${S}
106 ACLOCAL="aclocal --system-acdir=${STAGING_DATADIR}/aclocal" ./bootstrap --force
107 cd ${currentdir}
108}
109
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-25 22:46:15 +0000