diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-09-09 14:37:42 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-09-17 21:08:19 -0700 |
commit | 26786fab3091dc678371f0d26a4e597e749bf845 (patch) | |
tree | 88094c4abd50915caac3dfa86fef5afb9171e177 /meta-tpm | |
parent | 7aa34f55a603c6d3d34d90ae93f362b9fc418c89 (diff) | |
download | meta-security-26786fab3091dc678371f0d26a4e597e749bf845.tar.gz |
tpm2.0: update to 2.0.1
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-tpm')
-rw-r--r-- | meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_1.3.0.bb | 99 | ||||
-rw-r--r-- | meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.0.1.bb | 93 |
2 files changed, 93 insertions, 99 deletions
diff --git a/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_1.3.0.bb b/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_1.3.0.bb deleted file mode 100644 index b673c2b..0000000 --- a/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_1.3.0.bb +++ /dev/null | |||
@@ -1,99 +0,0 @@ | |||
1 | SUMMARY = "Software stack for TPM2." | ||
2 | DESCRIPTION = "tpm2.0-tss like woah." | ||
3 | LICENSE = "BSD-2-Clause" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da" | ||
5 | SECTION = "tpm" | ||
6 | |||
7 | DEPENDS = "autoconf-archive pkgconfig" | ||
8 | |||
9 | SRCREV = "b1d9ece8c6bea2e3043943b2edfaebcdca330c38" | ||
10 | |||
11 | SRC_URI = " \ | ||
12 | git://github.com/tpm2-software/tpm2-tss.git;branch=1.x \ | ||
13 | file://ax_pthread.m4 \ | ||
14 | " | ||
15 | |||
16 | inherit autotools pkgconfig systemd | ||
17 | |||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | do_configure_prepend () { | ||
21 | mkdir -p ${S}/m4 | ||
22 | cp ${WORKDIR}/ax_pthread.m4 ${S}/m4 | ||
23 | # execute the bootstrap script | ||
24 | currentdir=$(pwd) | ||
25 | cd ${S} | ||
26 | ACLOCAL="aclocal --system-acdir=${STAGING_DATADIR}/aclocal" ./bootstrap | ||
27 | cd $currentdir | ||
28 | } | ||
29 | |||
30 | INHERIT += "extrausers" | ||
31 | EXTRA_USERS_PARAMS = "\ | ||
32 | useradd -p '' tss; \ | ||
33 | groupadd tss; \ | ||
34 | " | ||
35 | |||
36 | SYSTEMD_PACKAGES = "resourcemgr" | ||
37 | SYSTEMD_SERVICE_resourcemgr = "resourcemgr.service" | ||
38 | SYSTEMD_AUTO_ENABLE_resourcemgr = "enable" | ||
39 | |||
40 | do_patch[postfuncs] += "${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','fix_systemd_unit','', d)}" | ||
41 | fix_systemd_unit () { | ||
42 | sed -i -e 's;^ExecStart=.*/resourcemgr;ExecStart=${sbindir}/resourcemgr;' ${S}/contrib/resourcemgr.service | ||
43 | } | ||
44 | |||
45 | do_install_append() { | ||
46 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
47 | install -d ${D}${systemd_system_unitdir} | ||
48 | install -m0644 ${S}/contrib/resourcemgr.service ${D}${systemd_system_unitdir}/resourcemgr.service | ||
49 | fi | ||
50 | } | ||
51 | |||
52 | PROVIDES = "${PACKAGES}" | ||
53 | PACKAGES = " \ | ||
54 | ${PN}-dbg \ | ||
55 | ${PN}-doc \ | ||
56 | libtss2 \ | ||
57 | libtss2-dev \ | ||
58 | libtss2-staticdev \ | ||
59 | libtctidevice \ | ||
60 | libtctidevice-dev \ | ||
61 | libtctidevice-staticdev \ | ||
62 | libtctisocket \ | ||
63 | libtctisocket-dev \ | ||
64 | libtctisocket-staticdev \ | ||
65 | resourcemgr \ | ||
66 | " | ||
67 | |||
68 | FILES_libtss2 = " \ | ||
69 | ${libdir}/libsapi.so.0.0.0 \ | ||
70 | ${libdir}/libmarshal.so.0.0.0 \ | ||
71 | " | ||
72 | FILES_libtss2-dev = " \ | ||
73 | ${includedir}/sapi \ | ||
74 | ${includedir}/tcti/common.h \ | ||
75 | ${libdir}/libsapi.so* \ | ||
76 | ${libdir}/libmarshal.so* \ | ||
77 | ${libdir}/pkgconfig/sapi.pc \ | ||
78 | " | ||
79 | FILES_libtss2-staticdev = " \ | ||
80 | ${libdir}/libsapi.a \ | ||
81 | ${libdir}/libsapi.la \ | ||
82 | ${libdir}/libmarshal.a \ | ||
83 | ${libdir}/libmarshal.la \ | ||
84 | " | ||
85 | FILES_libtctidevice = "${libdir}/libtcti-device.so.0.0.0" | ||
86 | FILES_libtctidevice-dev = " \ | ||
87 | ${includedir}/tcti/tcti_device.h \ | ||
88 | ${libdir}/libtcti-device.so* \ | ||
89 | ${libdir}/pkgconfig/tcti-device.pc \ | ||
90 | " | ||
91 | FILES_libtctidevice-staticdev = "${libdir}/libtcti-device.*a" | ||
92 | FILES_libtctisocket = "${libdir}/libtcti-socket.so.0.0.0" | ||
93 | FILES_libtctisocket-dev = " \ | ||
94 | ${includedir}/tcti/tcti_socket.h \ | ||
95 | ${libdir}/libtcti-socket.so* \ | ||
96 | ${libdir}/pkgconfig/tcti-socket.pc \ | ||
97 | " | ||
98 | FILES_libtctisocket-staticdev = "${libdir}/libtcti-socket.*a" | ||
99 | FILES_resourcemgr = "${sbindir}/resourcemgr ${systemd_system_unitdir}/resourcemgr.service" | ||
diff --git a/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.0.1.bb b/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.0.1.bb new file mode 100644 index 0000000..3e7b81a --- /dev/null +++ b/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.0.1.bb | |||
@@ -0,0 +1,93 @@ | |||
1 | SUMMARY = "Software stack for TPM2." | ||
2 | DESCRIPTION = "tpm2.0-tss like woah." | ||
3 | LICENSE = "BSD-2-Clause" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0b1d631c4218b72f6b05cb58613606f4" | ||
5 | SECTION = "tpm" | ||
6 | |||
7 | DEPENDS = "autoconf-archive-native libgcrypt" | ||
8 | |||
9 | SRCREV = "dc31e8dca9dbc77d16e419dc514ce8c526cd3351" | ||
10 | |||
11 | SRC_URI = "git://github.com/tpm2-software/tpm2-tss.git;branch=2.0.x" | ||
12 | |||
13 | inherit autotools-brokensep pkgconfig systemd | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | do_configure_prepend () { | ||
18 | ./bootstrap | ||
19 | } | ||
20 | |||
21 | INHERIT += "extrausers" | ||
22 | EXTRA_USERS_PARAMS = "\ | ||
23 | useradd -p '' tss; \ | ||
24 | groupadd tss; \ | ||
25 | " | ||
26 | |||
27 | SYSTEMD_PACKAGES = "resourcemgr" | ||
28 | SYSTEMD_SERVICE_resourcemgr = "resourcemgr.service" | ||
29 | SYSTEMD_AUTO_ENABLE_resourcemgr = "enable" | ||
30 | |||
31 | do_patch[postfuncs] += "${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','fix_systemd_unit','', d)}" | ||
32 | fix_systemd_unit () { | ||
33 | sed -i -e 's;^ExecStart=.*/resourcemgr;ExecStart=${sbindir}/resourcemgr;' ${S}/contrib/resourcemgr.service | ||
34 | } | ||
35 | |||
36 | do_install_append() { | ||
37 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
38 | install -d ${D}${systemd_system_unitdir} | ||
39 | install -m0644 ${S}/contrib/resourcemgr.service ${D}${systemd_system_unitdir}/resourcemgr.service | ||
40 | fi | ||
41 | } | ||
42 | |||
43 | PROVIDES = "${PACKAGES}" | ||
44 | PACKAGES = " \ | ||
45 | ${PN} \ | ||
46 | ${PN}-dbg \ | ||
47 | ${PN}-doc \ | ||
48 | libtss2-mu \ | ||
49 | libtss2-mu-dev \ | ||
50 | libtss2-mu-staticdev \ | ||
51 | libtss2-tcti-device \ | ||
52 | libtss2-tcti-device-dev \ | ||
53 | libtss2-tcti-device-staticdev \ | ||
54 | libtss2-tcti-mssim \ | ||
55 | libtss2-tcti-mssim-dev \ | ||
56 | libtss2-tcti-mssim-staticdev \ | ||
57 | libtss2 \ | ||
58 | libtss2-dev \ | ||
59 | libtss2-staticdev \ | ||
60 | resourcemgr \ | ||
61 | " | ||
62 | |||
63 | FILES_libtss2-tcti-device = "${libdir}/libtss2-tcti-device.so.*" | ||
64 | FILES_libtss2-tcti-device-dev = " \ | ||
65 | ${includedir}/tss2/tss2_tcti_device.h \ | ||
66 | ${libdir}/pkgconfig/tss2-tcti-device.pc \ | ||
67 | ${libdir}/libtss2-tcti-device.so" | ||
68 | FILES_libtss2-tcti-device-staticdev = "${libdir}/libtss2-tcti-device.*a" | ||
69 | |||
70 | FILES_libtss2-tcti-mssim = "${libdir}/libtss2-tcti-mssim.so.*" | ||
71 | FILES_libtss2-tcti-mssim-dev = " \ | ||
72 | ${includedir}/tss2/tss2_tcti_mssim.h \ | ||
73 | ${libdir}/pkgconfig/tss2-tcti-mssim.pc \ | ||
74 | ${libdir}/libtss2-tcti-mssim.so" | ||
75 | FILES_libtss2-tcti-mssim-staticdev = "${libdir}/libtss2-tcti-mssim.*a" | ||
76 | |||
77 | FILES_libtss2-mu = "${libdir}/libtss2-mu.so.*" | ||
78 | FILES_libtss2-mu-dev = " \ | ||
79 | ${includedir}/tss2/tss2_mu.h \ | ||
80 | ${libdir}/pkgconfig/tss2-mu.pc \ | ||
81 | ${libdir}/libtss2-mu.so" | ||
82 | FILES_libtss2-mu-staticdev = "${libdir}/libtss2-mu.*a" | ||
83 | |||
84 | FILES_libtss2 = "${libdir}/libtss2*so.*" | ||
85 | FILES_libtss2-dev = " \ | ||
86 | ${includedir} \ | ||
87 | ${libdir}/pkgconfig \ | ||
88 | ${libdir}/libtss2*so" | ||
89 | FILES_libtss2-staticdev = "${libdir}/libtss*a" | ||
90 | |||
91 | FILES_${PN} = "${libdir}/udev" | ||
92 | |||
93 | FILES_resourcemgr = "${sbindir}/resourcemgr ${systemd_system_unitdir}/resourcemgr.service" | ||