summaryrefslogtreecommitdiffstats
path: root/meta-tpm/recipes-tpm
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2019-03-14 07:08:30 -0700
committerArmin Kuster <akuster808@gmail.com>2019-03-16 04:17:29 -0700
commita471489ea2db0be8c32b95a2b8848f00ea4557f0 (patch)
tree5996d35e17f208e8bc02afeeea90796ef389463d /meta-tpm/recipes-tpm
parent77740fc3bdfaf6e8815abf7608e8924d6f2fcbdc (diff)
downloadmeta-security-a471489ea2db0be8c32b95a2b8848f00ea4557f0.tar.gz
tpm2: move tpm2 apps to recipes-tpm2
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-tpm/recipes-tpm')
-rw-r--r--meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd-init.sh65
-rw-r--r--meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default1
-rw-r--r--meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.1.1.bb55
-rw-r--r--meta-tpm/recipes-tpm/tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb23
-rw-r--r--meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_3.1.3.bb15
-rw-r--r--meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4332
-rw-r--r--meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch31
-rw-r--r--meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.2.1.bb79
-rw-r--r--meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator_138.bb22
9 files changed, 0 insertions, 623 deletions
diff --git a/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd-init.sh b/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd-init.sh
deleted file mode 100644
index c8dfb7d..0000000
--- a/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd-init.sh
+++ /dev/null
@@ -1,65 +0,0 @@
1#!/bin/sh
2
3### BEGIN INIT INFO
4# Provides: tpm2-abrmd
5# Required-Start: $local_fs $remote_fs $network
6# Required-Stop: $local_fs $remote_fs $network
7# Should-Start:
8# Should-Stop:
9# Default-Start: 2 3 4 5
10# Default-Stop: 0 1 6
11# Short-Description: starts tpm2-abrmd
12# Description: tpm2-abrmd implements the TCG resource manager
13### END INIT INFO
14
15PATH=/sbin:/bin:/usr/sbin:/usr/bin
16DAEMON=/usr/sbin/tpm2-abrmd
17NAME=tpm2-abrmd
18DESC="TCG TSS2 Access Broker and Resource Management daemon"
19USER="tss"
20
21test -x "${DAEMON}" || exit 0
22
23# Read configuration variable file if it is present
24[ -r /etc/default/$NAME ] && . /etc/default/$NAME
25
26case "${1}" in
27 start)
28 echo -n "Starting $DESC: "
29
30 if [ ! -e /dev/tpm* ]
31 then
32 echo "device driver not loaded, skipping."
33 exit 0
34 fi
35
36 start-stop-daemon --start --quiet --oknodo --background --pidfile /var/run/${NAME}.pid --user ${USER} --chuid ${USER} --exec ${DAEMON} -- ${DAEMON_OPTS}
37 RETVAL="$?"
38 echo "$NAME."
39 [ "$RETVAL" = 0 ] && pidof $DAEMON > /var/run/${NAME}.pid
40 exit $RETVAL
41 ;;
42
43 stop)
44 echo -n "Stopping $DESC: "
45
46 start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/${NAME}.pid --user ${USER} --exec ${DAEMON}
47 RETVAL="$?"
48 echo "$NAME."
49 rm -f /var/run/${NAME}.pid
50 exit $RETVAL
51 ;;
52
53 restart|force-reload)
54 "${0}" stop
55 sleep 1
56 "${0}" start
57 exit $?
58 ;;
59 *)
60 echo "Usage: ${NAME} {start|stop|restart|force-reload|status}" >&2
61 exit 3
62 ;;
63esac
64
65exit 0
diff --git a/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default b/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default
deleted file mode 100644
index 987978a..0000000
--- a/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default
+++ /dev/null
@@ -1 +0,0 @@
1DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transient-objects=20 --fail-on-loaded-trans"
diff --git a/meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.1.1.bb b/meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.1.1.bb
deleted file mode 100644
index 13dbf5a..0000000
--- a/meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.1.1.bb
+++ /dev/null
@@ -1,55 +0,0 @@
1SUMMARY = "TPM2 Access Broker & Resource Manager"
2DESCRIPTION = "This is a system daemon implementing the TPM2 access \
3broker (TAB) & Resource Manager (RM) spec from the TCG. The daemon (tpm2-abrmd) \
4is implemented using Glib and the GObject system. In this documentation and \
5in the code we use `tpm2-abrmd` and `tabrmd` interchangeably. \
6"
7SECTION = "security/tpm"
8
9LICENSE = "BSD-2-Clause"
10LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da"
11
12DEPENDS = "autoconf-archive dbus glib-2.0 tpm2.0-tss glib-2.0-native \
13 libtss2 libtss2-mu libtss2-tcti-device libtss2-tcti-mssim"
14
15
16SRC_URI = "\
17 git://github.com/tpm2-software/tpm2-abrmd.git \
18 file://tpm2-abrmd-init.sh \
19 file://tpm2-abrmd.default \
20"
21
22SRCREV = "06d9d433ba27159687255406baa37940db15465b"
23
24S = "${WORKDIR}/git"
25
26inherit autotools pkgconfig systemd update-rc.d useradd
27
28SYSTEMD_PACKAGES += "${PN}"
29SYSTEMD_SERVICE_${PN} = "tpm2-abrmd.service"
30SYSTEMD_AUTO_ENABLE_${PN} = "disable"
31
32INITSCRIPT_NAME = "${PN}"
33INITSCRIPT_PARAMS = "start 99 2 3 4 5 . stop 19 0 1 6 ."
34
35USERADD_PACKAGES = "${PN}"
36GROUPADD_PARAM_${PN} = "tss"
37USERADD_PARAM_${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss"
38
39PACKAGECONFIG ?="${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', '', d)}"
40PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, --with-systemdsystemunitdir=no"
41
42do_install_append() {
43 install -d "${D}${sysconfdir}/init.d"
44 install -m 0755 "${WORKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd"
45
46 install -d "${D}${sysconfdir}/default"
47 install -m 0644 "${WORKDIR}/tpm2-abrmd.default" "${D}${sysconfdir}/default/tpm2-abrmd"
48}
49
50FILES_${PN} += "${libdir}/systemd/system-preset \
51 ${datadir}/dbus-1"
52
53RDEPENDS_${PN} += "tpm2.0-tss"
54
55BBCLASSEXTEND = "native"
diff --git a/meta-tpm/recipes-tpm/tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb b/meta-tpm/recipes-tpm/tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb
deleted file mode 100644
index 36530be..0000000
--- a/meta-tpm/recipes-tpm/tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1SUMMARY = "The tpm2-tss-engine project implements a cryptographic engine for OpenSSL."
2DESCRIPTION = "The tpm2-tss-engine project implements a cryptographic engine for OpenSSL for Trusted Platform Module (TPM 2.0) using the tpm2-tss software stack that follows the Trusted Computing Groups (TCG) TPM Software Stack (TSS 2.0). It uses the Enhanced System API (ESAPI) interface of the TSS 2.0 for downwards communication. It supports RSA decryption and signatures as well as ECDSA signatures."
3
4LICENSE = "BSD-2-Clause"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=3fb0047fd29391478a71e8e6101c76eb"
6
7SECTION = "security/tpm"
8
9DEPENDS = "autoconf-archive-native bash-completion libtss2 libgcrypt openssl"
10
11SRCREV = "bef89ec79cbb4c99963b0e336d9184827c545782"
12SRC_URI = "git://github.com/tpm2-software/tpm2-tss-engine.git"
13
14inherit autotools-brokensep pkgconfig systemd
15
16S = "${WORKDIR}/git"
17
18PACKAGES += "${PN}-engines ${PN}-engines-staticdev ${PN}-bash-completion"
19
20FILES_${PN}-dev = "${libdir}/engines-1.1/tpm2tss.so ${includedir}/*"
21FILES_${PN}-engines = "${libdir}/engines-1.1/lib*.so*"
22FILES_${PN}-engines-staticdev = "${libdir}/engines-1.1/libtpm2tss.a"
23FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions"
diff --git a/meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_3.1.3.bb b/meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_3.1.3.bb
deleted file mode 100644
index 6cceba6..0000000
--- a/meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_3.1.3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1SUMMARY = "Tools for TPM2."
2DESCRIPTION = "tpm2.0-tools"
3LICENSE = "BSD"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=91b7c548d73ea16537799e8060cea819"
5SECTION = "tpm"
6
7DEPENDS = "pkgconfig tpm2.0-tss openssl curl autoconf-archive"
8
9SRCREV = "74ba065e5914bc5d713ca3709d62a5751b097369"
10
11SRC_URI = "https://github.com/tpm2-software/tpm2-tools.git;branch=3.X"
12
13S = "${WORKDIR}/git"
14
15inherit autotools pkgconfig
diff --git a/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4 b/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4
deleted file mode 100644
index d383ad5..0000000
--- a/meta-tpm/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-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch b/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch
deleted file mode 100644
index ecaca6e..0000000
--- a/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1This fixes musl build issue do to missing FD_* defines.
2Add sys/select.h
3
4Upstream-Status: Pending
5
6Signed-off-by: Armin Kuster <akuster@mvista.com>
7
8Index: TPM2.0-TSS/tcti/tcti_socket.cpp
9===================================================================
10--- TPM2.0-TSS.orig/tcti/tcti_socket.cpp
11+++ TPM2.0-TSS/tcti/tcti_socket.cpp
12@@ -28,6 +28,7 @@
13 #include <stdio.h>
14 #include <stdlib.h> // Needed for _wtoi
15
16+#include "sys/select.h"
17 #include <sapi/tpm20.h>
18 #include <tcti/tcti_socket.h>
19 #include "sysapi_util.h"
20Index: TPM2.0-TSS/resourcemgr/resourcemgr.c
21===================================================================
22--- TPM2.0-TSS.orig/resourcemgr/resourcemgr.c
23+++ TPM2.0-TSS/resourcemgr/resourcemgr.c
24@@ -28,6 +28,7 @@
25 #include <stdio.h>
26 #include <stdlib.h> // Needed for _wtoi
27
28+#include "sys/select.h"
29 #include <sapi/tpm20.h>
30 #include <tcti/tcti_device.h>
31 #include <tcti/tcti_socket.h>
diff --git a/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.2.1.bb b/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.2.1.bb
deleted file mode 100644
index 4f9db50..0000000
--- a/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.2.1.bb
+++ /dev/null
@@ -1,79 +0,0 @@
1SUMMARY = "Software stack for TPM2."
2DESCRIPTION = "tpm2.0-tss like woah."
3LICENSE = "BSD-2-Clause"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da"
5SECTION = "tpm"
6
7DEPENDS = "autoconf-archive-native libgcrypt openssl"
8
9SRCREV = "eb69e13559f20a0b49002a685c6f4a39be9503e2"
10
11SRC_URI = "git://github.com/tpm2-software/tpm2-tss.git;branch=2.2.x"
12
13inherit autotools-brokensep pkgconfig systemd
14
15S = "${WORKDIR}/git"
16
17PACKAGECONFIG ??= ""
18PACKAGECONFIG[oxygen] = ",--disable-doxygen-doc, "
19
20do_configure_prepend () {
21 ./bootstrap
22}
23
24INHERIT += "extrausers"
25EXTRA_USERS_PARAMS = "\
26 useradd -p '' tss; \
27 groupadd tss; \
28 "
29
30PROVIDES = "${PACKAGES}"
31PACKAGES = " \
32 ${PN} \
33 ${PN}-dbg \
34 ${PN}-doc \
35 libtss2-mu \
36 libtss2-mu-dev \
37 libtss2-mu-staticdev \
38 libtss2-tcti-device \
39 libtss2-tcti-device-dev \
40 libtss2-tcti-device-staticdev \
41 libtss2-tcti-mssim \
42 libtss2-tcti-mssim-dev \
43 libtss2-tcti-mssim-staticdev \
44 libtss2 \
45 libtss2-dev \
46 libtss2-staticdev \
47"
48
49FILES_libtss2-tcti-device = "${libdir}/libtss2-tcti-device.so.*"
50FILES_libtss2-tcti-device-dev = " \
51 ${includedir}/tss2/tss2_tcti_device.h \
52 ${libdir}/pkgconfig/tss2-tcti-device.pc \
53 ${libdir}/libtss2-tcti-device.so"
54FILES_libtss2-tcti-device-staticdev = "${libdir}/libtss2-tcti-device.*a"
55
56FILES_libtss2-tcti-mssim = "${libdir}/libtss2-tcti-mssim.so.*"
57FILES_libtss2-tcti-mssim-dev = " \
58 ${includedir}/tss2/tss2_tcti_mssim.h \
59 ${libdir}/pkgconfig/tss2-tcti-mssim.pc \
60 ${libdir}/libtss2-tcti-mssim.so"
61FILES_libtss2-tcti-mssim-staticdev = "${libdir}/libtss2-tcti-mssim.*a"
62
63FILES_libtss2-mu = "${libdir}/libtss2-mu.so.*"
64FILES_libtss2-mu-dev = " \
65 ${includedir}/tss2/tss2_mu.h \
66 ${libdir}/pkgconfig/tss2-mu.pc \
67 ${libdir}/libtss2-mu.so"
68FILES_libtss2-mu-staticdev = "${libdir}/libtss2-mu.*a"
69
70FILES_libtss2 = "${libdir}/libtss2*so.*"
71FILES_libtss2-dev = " \
72 ${includedir} \
73 ${libdir}/pkgconfig \
74 ${libdir}/libtss2*so"
75FILES_libtss2-staticdev = "${libdir}/libtss*a"
76
77FILES_${PN} = "${libdir}/udev"
78
79RDEPENDS_libtss2 = "libgcrypt"
diff --git a/meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator_138.bb b/meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator_138.bb
deleted file mode 100644
index 866791c..0000000
--- a/meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator_138.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1SUMMARY = "TPM 2.0 Simulator Extraction Script"
2LICENSE = "BSD-2-Clause"
3LIC_FILES_CHKSUM = "file://LICENSE;md5=1415f7be284540b81d9d28c67c1a6b8b"
4
5DEPENDS = "python"
6
7SRCREV = "e45324eba268723d39856111e7933c5c76238481"
8SRC_URI = "git://github.com/stwagnr/tpm2simulator.git"
9
10S = "${WORKDIR}/git"
11OECMAKE_SOURCEPATH = "${S}/cmake"
12
13inherit native lib_package cmake
14
15EXTRA_OECMAKE = " \
16 -DCMAKE_BUILD_TYPE=Debug \
17 -DSPEC_VERSION=138 \
18"
19
20do_configure_prepend () {
21 sed -i 's/^SET = False/SET = True/' ${S}/scripts/settings.py
22}