Skip to contentSkip to conversation

move tpm into its own layer

PATCH In review Armin Kuster 3 participants 13 messages May 9, 2017 – May 10, 2017

lore
Share & tools
lore
#0 lore raw

cover move tpm into its own layer

tpm recipes copied as-is

This was done to allow inclusion of TPM components independent of the rest of the layer. minimizes layerdepends

fixed incorrect use of DISTRO_FEATURES

Updated tpm kernel configs to newer version

added a few new packagegroups

Armin Kuster (10):
tpm: move to a sub layer
change tpm from distro to machine feature
meta-tpm: add base package group as was in meta-security
packagegroup: remove tpm components
tpm packagegroups: split into logical units
tpm-i2c: some systems us i2c TPM
kernel tpm rework
tpm-image: used for testing for now.
linux-stable: fix module selections
tpm2: package groups fixes

 meta-tpm/README                                    |  0
 meta-tpm/conf/layer.conf                           | 13 ++++++++++
 meta-tpm/recipes-core/images/security-tpm-image.bb | 19 ++++++++++++++
 .../packagegroup/packagegroup-security-tpm-i2c.bb  | 19 ++++++++++++++
 .../packagegroup/packagegroup-security-tpm.bb      | 29 ++++++++++++++++++++++
 .../packagegroup/packagegroup-security-tpm2.bb     | 18 ++++++++++++++
 .../packagegroup/packagegroup-security-vtpm.bb     | 14 +++++++++++
 meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg  |  8 ++++++
 meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc  |  3 +++
 meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg |  6 +++++
 meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc |  3 +++
 .../recipes-kernel/linux/linux-yocto/tpm_i2c.cfg   | 15 +++++++++++
 .../recipes-kernel/linux/linux-yocto/tpm_i2c.scc   |  6 +++++
 .../recipes-kernel/linux/linux-yocto/tpm_x86.cfg   |  4 +++
 meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg |  5 ++++
 meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc |  4 +++
 .../recipes-kernel/linux/linux-yocto_4.%.bbappend  | 17 +++++++++++++
 .../Convert-another-vdprintf-to-dprintf.patch      |  0
 .../files/Use-format-s-for-call-to-dprintf.patch   |  0
 .../libtpm/files/fix_signed_issue.patch            |  0
 .../recipes-tpm}/libtpm/libtpm_1.0.bb              |  0
 .../recipes-tpm}/swtpm/files/fix_fcntl_h.patch     |  0
 .../swtpm/files/fix_lib_search_path.patch          |  0
 .../swtpm/files/fix_signed_issue.patch             |  0
 .../recipes-tpm}/swtpm/files/ioctl_h.patch         |  0
 .../recipes-tpm}/swtpm/swtpm-wrappers-native.bb    |  0
 .../recipes-tpm}/swtpm/swtpm_1.0.bb                |  0
 .../tpm-tools/files/tpm-tools-extendpcr.patch      |  0
 .../recipes-tpm}/tpm-tools/tpm-tools_git.bb        |  0
 .../recipes-tpm}/tpm2.0-tools/tpm2.0-tools_git.bb  |  0
 .../tpm2.0-tss/tpm2.0-tss/ax_pthread.m4            |  0
 .../tpm2.0-tss/fix_musl_select_include.patch       |  0
 .../recipes-tpm}/tpm2.0-tss/tpm2.0-tss_git.bb      |  0
 .../tpm2simulator/tpm2simulator-native_116.bb      |  0
 ...path-use-POSIX-getpwent-instead-of-getpwe.patch |  0
 .../recipes-tpm}/trousers/files/tcsd.service       |  0
 .../trousers/files/trousers-udev.rules             |  0
 .../recipes-tpm}/trousers/files/trousers.init.sh   |  0
 .../recipes-tpm}/trousers/trousers_git.bb          |  0
 recipes-kernel/linux/linux-yocto_4.10.bbappend     |  3 ---
 .../packagegroup/packagegroup-core-security.bb     | 18 ++------------
 41 files changed, 185 insertions(+), 19 deletions(-)
 create mode 100644 meta-tpm/README
 create mode 100644 meta-tpm/conf/layer.conf
 create mode 100644 meta-tpm/recipes-core/images/security-tpm-image.bb
 create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb
 create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb
 create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb
 create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend
 rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/files/Convert-another-vdprintf-to-dprintf.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/files/Use-format-s-for-call-to-dprintf.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/files/fix_signed_issue.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/libtpm_1.0.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/fix_fcntl_h.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/fix_lib_search_path.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/fix_signed_issue.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/ioctl_h.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/swtpm-wrappers-native.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/swtpm_1.0.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm-tools/files/tpm-tools-extendpcr.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm-tools/tpm-tools_git.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tools/tpm2.0-tools_git.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4 (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tss/tpm2.0-tss_git.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2simulator/tpm2simulator-native_116.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/tcsd.service (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/trousers-udev.rules (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/trousers.init.sh (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/trousers_git.bb (100%)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/10 tpm: move to a sub layer

---
 meta-tpm/README                                             |  0
 meta-tpm/conf/layer.conf                                    | 13 +++++++++++++
 meta-tpm/recipes-kernel/linux/linux-yocto_4.10.bbappend     |  5 +++++
 .../libtpm/files/Convert-another-vdprintf-to-dprintf.patch  |  0
 .../libtpm/files/Use-format-s-for-call-to-dprintf.patch     |  0
 .../recipes-tpm}/libtpm/files/fix_signed_issue.patch        |  0
 {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/libtpm_1.0.bb  |  0
 .../recipes-tpm}/swtpm/files/fix_fcntl_h.patch              |  0
 .../recipes-tpm}/swtpm/files/fix_lib_search_path.patch      |  0
 .../recipes-tpm}/swtpm/files/fix_signed_issue.patch         |  0
 .../recipes-tpm}/swtpm/files/ioctl_h.patch                  |  0
 .../recipes-tpm}/swtpm/swtpm-wrappers-native.bb             |  0
 {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/swtpm_1.0.bb    |  0
 .../recipes-tpm}/tpm-tools/files/tpm-tools-extendpcr.patch  |  0
 .../recipes-tpm}/tpm-tools/tpm-tools_git.bb                 |  0
 .../recipes-tpm}/tpm2.0-tools/tpm2.0-tools_git.bb           |  0
 .../recipes-tpm}/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4        |  0
 .../tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch     |  0
 .../recipes-tpm}/tpm2.0-tss/tpm2.0-tss_git.bb               |  0
 .../recipes-tpm}/tpm2simulator/tpm2simulator-native_116.bb  |  0
 ...-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch |  0
 .../recipes-tpm}/trousers/files/tcsd.service                |  0
 .../recipes-tpm}/trousers/files/trousers-udev.rules         |  0
 .../recipes-tpm}/trousers/files/trousers.init.sh            |  0
 .../recipes-tpm}/trousers/trousers_git.bb                   |  0
 recipes-kernel/linux/linux-yocto_4.10.bbappend              |  3 ---
 26 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 meta-tpm/README
 create mode 100644 meta-tpm/conf/layer.conf
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto_4.10.bbappend
 rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/files/Convert-another-vdprintf-to-dprintf.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/files/Use-format-s-for-call-to-dprintf.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/files/fix_signed_issue.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/libtpm_1.0.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/fix_fcntl_h.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/fix_lib_search_path.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/fix_signed_issue.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/ioctl_h.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/swtpm-wrappers-native.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/swtpm_1.0.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm-tools/files/tpm-tools-extendpcr.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm-tools/tpm-tools_git.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tools/tpm2.0-tools_git.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4 (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tss/tpm2.0-tss_git.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2simulator/tpm2simulator-native_116.bb (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/tcsd.service (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/trousers-udev.rules (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/trousers.init.sh (100%)
 rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/trousers_git.bb (100%)
meta-tpm/README new file +0 -0
new file mode 100644
index 0000000..e69de29
meta-tpm/conf/layer.conf new file +13 -0
new file mode 100644
index 0000000..5085db5
@@ -0,0 +1,13 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend ${LAYERDIR}/classes/*.bbclass"
+
+BBFILE_COLLECTIONS += "tpm-layer"
+BBFILE_PATTERN_tpm-layer = "^${LAYERDIR}/"
+BBFILE_PRIORITY_tpm-layer = "6"
+
+LAYERDEPENDS_tpm-layer = " \
+    core \
+"
meta-tpm/recipes-kernel/linux/linux-yocto_4.10.bbappend new file +5 -0
new file mode 100644
index 0000000..e6b3c65
@@ -0,0 +1,5 @@
+#
+# TPM kernel support
+
+KERNEL_FEATURES_append += "${@bb.utils.contains('DISTRO_FEATURES', 'tpm', ' features/tpm/tpm.scc', '', d)}"
+
meta-tpm/recipes-tpm/libtpm/files/Convert-another-vdprintf-to-dprintf.patch renamed from recipes-tpm/libtpm/files/Convert-another-vdprintf-to-dprintf.patch +0 -0
similarity index 100%
rename from recipes-tpm/libtpm/files/Convert-another-vdprintf-to-dprintf.patch
rename to meta-tpm/recipes-tpm/libtpm/files/Convert-another-vdprintf-to-dprintf.patch
meta-tpm/recipes-tpm/libtpm/files/Use-format-s-for-call-to-dprintf.patch renamed from recipes-tpm/libtpm/files/Use-format-s-for-call-to-dprintf.patch +0 -0
similarity index 100%
rename from recipes-tpm/libtpm/files/Use-format-s-for-call-to-dprintf.patch
rename to meta-tpm/recipes-tpm/libtpm/files/Use-format-s-for-call-to-dprintf.patch
meta-tpm/recipes-tpm/libtpm/files/fix_signed_issue.patch renamed from recipes-tpm/libtpm/files/fix_signed_issue.patch +0 -0
similarity index 100%
rename from recipes-tpm/libtpm/files/fix_signed_issue.patch
rename to meta-tpm/recipes-tpm/libtpm/files/fix_signed_issue.patch
meta-tpm/recipes-tpm/libtpm/libtpm_1.0.bb renamed from recipes-tpm/libtpm/libtpm_1.0.bb +0 -0
similarity index 100%
rename from recipes-tpm/libtpm/libtpm_1.0.bb
rename to meta-tpm/recipes-tpm/libtpm/libtpm_1.0.bb
meta-tpm/recipes-tpm/swtpm/files/fix_fcntl_h.patch renamed from recipes-tpm/swtpm/files/fix_fcntl_h.patch +0 -0
similarity index 100%
rename from recipes-tpm/swtpm/files/fix_fcntl_h.patch
rename to meta-tpm/recipes-tpm/swtpm/files/fix_fcntl_h.patch
meta-tpm/recipes-tpm/swtpm/files/fix_lib_search_path.patch renamed from recipes-tpm/swtpm/files/fix_lib_search_path.patch +0 -0
similarity index 100%
rename from recipes-tpm/swtpm/files/fix_lib_search_path.patch
rename to meta-tpm/recipes-tpm/swtpm/files/fix_lib_search_path.patch
meta-tpm/recipes-tpm/swtpm/files/fix_signed_issue.patch renamed from recipes-tpm/swtpm/files/fix_signed_issue.patch +0 -0
similarity index 100%
rename from recipes-tpm/swtpm/files/fix_signed_issue.patch
rename to meta-tpm/recipes-tpm/swtpm/files/fix_signed_issue.patch
meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch renamed from recipes-tpm/swtpm/files/ioctl_h.patch +0 -0
similarity index 100%
rename from recipes-tpm/swtpm/files/ioctl_h.patch
rename to meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch
meta-tpm/recipes-tpm/swtpm/swtpm-wrappers-native.bb renamed from recipes-tpm/swtpm/swtpm-wrappers-native.bb +0 -0
similarity index 100%
rename from recipes-tpm/swtpm/swtpm-wrappers-native.bb
rename to meta-tpm/recipes-tpm/swtpm/swtpm-wrappers-native.bb
meta-tpm/recipes-tpm/swtpm/swtpm_1.0.bb renamed from recipes-tpm/swtpm/swtpm_1.0.bb +0 -0
similarity index 100%
rename from recipes-tpm/swtpm/swtpm_1.0.bb
rename to meta-tpm/recipes-tpm/swtpm/swtpm_1.0.bb
meta-tpm/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch renamed from recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch +0 -0
similarity index 100%
rename from recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch
rename to meta-tpm/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch
meta-tpm/recipes-tpm/tpm-tools/tpm-tools_git.bb renamed from recipes-tpm/tpm-tools/tpm-tools_git.bb +0 -0
similarity index 100%
rename from recipes-tpm/tpm-tools/tpm-tools_git.bb
rename to meta-tpm/recipes-tpm/tpm-tools/tpm-tools_git.bb
meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb renamed from recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb +0 -0
similarity index 100%
rename from recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb
rename to meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb
meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4 renamed from recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4 +0 -0
similarity index 100%
rename from recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4
rename to meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4
meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch renamed from recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch +0 -0
similarity index 100%
rename from recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch
rename to meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch
meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb renamed from recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb +0 -0
similarity index 100%
rename from recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb
rename to meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb
meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator-native_116.bb renamed from recipes-tpm/tpm2simulator/tpm2simulator-native_116.bb +0 -0
similarity index 100%
rename from recipes-tpm/tpm2simulator/tpm2simulator-native_116.bb
rename to meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator-native_116.bb
meta-tpm/recipes-tpm/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch renamed from recipes-tpm/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch +0 -0
similarity index 100%
rename from recipes-tpm/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch
rename to meta-tpm/recipes-tpm/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch
meta-tpm/recipes-tpm/trousers/files/tcsd.service renamed from recipes-tpm/trousers/files/tcsd.service +0 -0
similarity index 100%
rename from recipes-tpm/trousers/files/tcsd.service
rename to meta-tpm/recipes-tpm/trousers/files/tcsd.service
meta-tpm/recipes-tpm/trousers/files/trousers-udev.rules renamed from recipes-tpm/trousers/files/trousers-udev.rules +0 -0
similarity index 100%
rename from recipes-tpm/trousers/files/trousers-udev.rules
rename to meta-tpm/recipes-tpm/trousers/files/trousers-udev.rules
meta-tpm/recipes-tpm/trousers/files/trousers.init.sh renamed from recipes-tpm/trousers/files/trousers.init.sh +0 -0
similarity index 100%
rename from recipes-tpm/trousers/files/trousers.init.sh
rename to meta-tpm/recipes-tpm/trousers/files/trousers.init.sh
meta-tpm/recipes-tpm/trousers/trousers_git.bb renamed from recipes-tpm/trousers/trousers_git.bb +0 -0
similarity index 100%
rename from recipes-tpm/trousers/trousers_git.bb
rename to meta-tpm/recipes-tpm/trousers/trousers_git.bb
recipes-kernel/linux/linux-yocto_4.10.bbappend +0 -3
index 35a32b6..0e610d4 100644
@@ -1,8 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.10:"
 
-# TPM kernel support
-KERNEL_FEATURES_append += "${@bb.utils.contains('DISTRO_FEATURES', 'tpm', ' features/tpm/tpm.scc', '', d)}"
-
 SRC_URI += "\
         ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor.cfg', '', d)} \
 "
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/10 change tpm from distro to machine feature

In reply to Armin Kuster
---
 meta-tpm/recipes-kernel/linux/linux-yocto_4.10.bbappend     | 2 +-
 recipes-security/packagegroup/packagegroup-core-security.bb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
meta-tpm/recipes-kernel/linux/linux-yocto_4.10.bbappend +1 -1
index e6b3c65..208d23f 100644
@@ -1,5 +1,5 @@
 #
 # TPM kernel support
 
-KERNEL_FEATURES_append += "${@bb.utils.contains('DISTRO_FEATURES', 'tpm', ' features/tpm/tpm.scc', '', d)}"
+KERNEL_FEATURES_append += "${@bb.utils.contains('MACHINE_FEATURES', 'tpm', ' features/tpm/tpm.scc', '', d)}"
 
recipes-security/packagegroup/packagegroup-core-security.bb +2 -2
index ae856c7..2180908 100644
@@ -11,7 +11,7 @@ PACKAGES = "\
     packagegroup-security-scanners \
     packagegroup-security-ids  \
     packagegroup-security-mac  \
-    ${@bb.utils.contains("DISTRO_FEATURES", "tpm", "packagegroup-security-tpm", "",d)} \
+    ${@bb.utils.contains("MACHINE_FEATURES", "tpm", "packagegroup-security-tpm", "",d)} \
     "
 
 RDEPENDS_packagegroup-core-security = "\
@@ -19,7 +19,7 @@ RDEPENDS_packagegroup-core-security = "\
     packagegroup-security-scanners \
     packagegroup-security-ids  \
     packagegroup-security-mac  \
-    ${@bb.utils.contains("DISTRO_FEATURES", "tpm", "packagegroup-security-tpm", "",d)} \
+    ${@bb.utils.contains("MACHINE_FEATURES", "tpm", "packagegroup-security-tpm", "",d)} \
     "
 
 SUMMARY_packagegroup-security-utils = "Security utilities"
Signature · 1 line
2.7.4
#3 lore raw

PATCH 3/10 meta-tpm: add base package group as was in meta-security

In reply to Armin Kuster
---
 .../packagegroup/packagegroup-security-tpm.bb      | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb
meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb new file +23 -0
new file mode 100644
index 0000000..f176627
@@ -0,0 +1,23 @@
+DESCRIPTION = "Security packagegroup for Poky"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit packagegroup
+
+PACKAGES = "packagegroup-security-tpm"
+
+SUMMARY_packagegroup-security-tpm = "Security TPM support"
+RDEPENDS_packagegroup-security-tpm = " \
+    tpm-tools \
+    trousers \
+    tpm2.0-tools \
+    libtss2 \
+    resourcemgr \
+    libtctidevice \
+    libtctisocket \
+    resourcemgr \
+    libtpm \
+    swtpm \
+    "
+
Signature · 1 line
2.7.4
#4 lore raw

PATCH 4/10 packagegroup: remove tpm components

In reply to Armin Kuster
---
 .../packagegroup/packagegroup-core-security.bb             | 14 --------------
 1 file changed, 14 deletions(-)
recipes-security/packagegroup/packagegroup-core-security.bb +0 -14
index 2180908..681874c 100644
@@ -57,17 +57,3 @@ SUMMARY_packagegroup-security-mac = "Security Mandatory Access Control systems"
 RDEPENDS_packagegroup-security-mac = " \
     ${@bb.utils.contains("DISTRO_FEATURES", "tomoyo", "ccs-tools", "",d)} \
     "
-
-SUMMARY_packagegroup-security-tpm = "Security TPM support"
-RDEPENDS_packagegroup-security-tpm = " \
-    tpm-tools \
-    trousers \
-    tpm2.0-tools \
-    libtss2 \
-    resourcemgr \
-    libtctidevice \
-    libtctisocket \
-    resourcemgr \
-    libtpm \
-    swtpm \
-    "
Signature · 1 line
2.7.4
#5 lore raw

PATCH 5/10 tpm packagegroups: split into logical units

In reply to Armin Kuster

this should help mitgate the need to pull in too many layers if swtpm in not wanted

---
 .../packagegroup/packagegroup-security-tpm.bb          |  9 ---------
 .../packagegroup/packagegroup-security-tpm2.bb         | 18 ++++++++++++++++++
 .../packagegroup/packagegroup-security-vtpm.bb         | 14 ++++++++++++++
 3 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb
 create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb
meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb +0 -9
index f176627..2412348 100644
@@ -11,13 +11,4 @@ SUMMARY_packagegroup-security-tpm = "Security TPM support"
 RDEPENDS_packagegroup-security-tpm = " \
     tpm-tools \
     trousers \
-    tpm2.0-tools \
-    libtss2 \
-    resourcemgr \
-    libtctidevice \
-    libtctisocket \
-    resourcemgr \
-    libtpm \
-    swtpm \
     "
-
meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb new file +18 -0
new file mode 100644
index 0000000..1c96cbe
@@ -0,0 +1,18 @@
+DESCRIPTION = "Security packagegroup for Poky"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit packagegroup
+
+PACKAGES = "packagegroup-security-tpm2"
+
+SUMMARY_packagegroup-security-tpm2 = "Security TPM 2.0 support"
+RDEPENDS_packagegroup-security-tpm2 = " \
+    tpm2.0-tools \
+    libtss2 \
+    libtctidevice \
+    libtctisocket \
+    resourcemgr \
+    kernel-module-tpm-crb \
+    "
meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb new file +14 -0
new file mode 100644
index 0000000..f7eee7c
@@ -0,0 +1,14 @@
+DESCRIPTION = "Security packagegroup for Poky"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit packagegroup
+
+PACKAGES = "packagegroup-security-vtpm"
+
+SUMMARY_packagegroup-security-vtpm = "Security Software vTPM support"
+RDEPENDS_packagegroup-security-vtpm = " \
+    libtpm \
+    swtpm \
+    "		
Signature · 1 line
2.7.4
#6 lore raw

PATCH 6/10 tpm-i2c: some systems us i2c TPM

In reply to Armin Kuster

add modules and i2c support

---
 .../packagegroup/packagegroup-security-tpm-i2c.bb       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb
meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb new file +17 -0
new file mode 100644
index 0000000..d4c3bb7
@@ -0,0 +1,17 @@
+DESCRIPTION = "Security packagegroup for TPM i2c support"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit packagegroup
+
+PACKAGES = "packagegroup-security-tpm-i2c"
+
+SUMMARY_packagegroup-security-tpm-i2c = "Security TPM i2c support"
+RDEPENDS_packagegroup-security-tpm-i2c = " \
+    kernel-module-tpm-i2c-atmel \
+    kernel-module-tpm-i2c-infineon \
+    kernel-module-tpm-i2c-nuvoton \
+    kernel-module-tpm-st33zp24 \
+    kernel-module-tpm-st33zp24-i2c \
+    "
Signature · 1 line
2.7.4
#7 lore raw

PATCH 7/10 kernel tpm rework

In reply to Armin Kuster
---
 meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg       |  5 +++++
 meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc       |  3 +++
 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg   | 15 +++++++++++++++
 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc   |  6 ++++++
 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg   |  4 ++++
 meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg      |  5 +++++
 meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc      |  4 ++++
 meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend  | 11 +++++++++++
 meta-tpm/recipes-kernel/linux/linux-yocto_4.10.bbappend |  5 -----
 9 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend
 delete mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto_4.10.bbappend
meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg new file +5 -0
new file mode 100644
index 0000000..e34b24e
@@ -0,0 +1,5 @@
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TPM=y
+CONFIG_TCG_TIS_CORE=y
+CONFIG_TCG_TIS=y
+CONFIG_SECURITYFS=y
meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc new file +3 -0
new file mode 100644
index 0000000..2949ed4
@@ -0,0 +1,3 @@
+define KFEATURE_DESCRIPTION "Enable TPM"
+
+kconf hardware tpm.cfg
meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg new file +15 -0
new file mode 100644
index 0000000..59993f9
@@ -0,0 +1,15 @@
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TPM=y
+CONFIG_TCG_TIS_CORE=y
+CONFIG_TCG_TIS=y
+CONFIG_SECURITYFS=y
+
+CONFIG_REGMAP_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_RTC_I2C_AND_SPI=y
+
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc new file +6 -0
new file mode 100644
index 0000000..0e4eedb
@@ -0,0 +1,6 @@
+define KFEATURE_DESCRIPTION "Enable TPM i2c"
+
+include features/i2c/i2c.scc
+
+kconf hardware tpm_i2c.cfg
+
meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg new file +4 -0
new file mode 100644
index 0000000..8be331a
@@ -0,0 +1,4 @@
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_TIS_ST33ZP24=m
meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg new file +5 -0
new file mode 100644
index 0000000..a8b3758
@@ -0,0 +1,5 @@
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TPM=y
+CONFIG_TCG_VTPM_PROXY=y
+CONFIG_SECURITYFS=y
+~                    
meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc new file +4 -0
new file mode 100644
index 0000000..e842da6
@@ -0,0 +1,4 @@
+define KFEATURE_DESCRIPTION "Enable vTPM"
+
+kconf hardware vtpm.cfg
+
meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend new file +11 -0
new file mode 100644
index 0000000..0eebf00
@@ -0,0 +1,11 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
+
+# Enable tpm in kernel 
+SRC_URI_append_x86 = " \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.scc', '', d)} \
+    "
+
+SRC_URI += " \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm_i2c', 'file://tpm_i2c.scc', '', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'vtpm', 'file://vtpm.scc', '', d)} \
+    "
meta-tpm/recipes-kernel/linux/linux-yocto_4.10.bbappend deleted +0 -5
deleted file mode 100644
index 208d23f..0000000
@@ -1,5 +0,0 @@
-#
-# TPM kernel support
-
-KERNEL_FEATURES_append += "${@bb.utils.contains('MACHINE_FEATURES', 'tpm', ' features/tpm/tpm.scc', '', d)}"
-
Signature · 1 line
2.7.4
#8 lore raw

PATCH 8/10 tpm-image: used for testing for now.

In reply to Armin Kuster
---
 meta-tpm/recipes-core/images/security-tpm-image.bb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 meta-tpm/recipes-core/images/security-tpm-image.bb
meta-tpm/recipes-core/images/security-tpm-image.bb new file +19 -0
new file mode 100644
index 0000000..a337076
@@ -0,0 +1,19 @@
+DESCRIPTION = "A small image for building meta-security packages"
+
+IMAGE_FEATURES += "ssh-server-openssh"
+
+IMAGE_INSTALL = "\
+    packagegroup-base \
+    packagegroup-core-boot \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm',  'packagegroup-security-tpm',  '', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2', '', d)} \
+    os-release \
+    ${CORE_IMAGE_EXTRA_INSTALL}"
+
+IMAGE_LINGUAS ?= " "
+
+LICENSE = "MIT"
+
+inherit core-image
+
+export IMAGE_BASENAME = "security-tpm-image"
Signature · 1 line
2.7.4
#9 lore raw

PATCH 9/10 linux-stable: fix module selections

In reply to Armin Kuster
---
 meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg      | 3 +++
 meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg     | 6 ++++++
 meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc     | 3 +++
 meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend | 6 ++++++
 4 files changed, 18 insertions(+)
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg
 create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc
meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg +3 -0
index e34b24e..8782823 100644
@@ -3,3 +3,6 @@ CONFIG_TCG_TPM=y
 CONFIG_TCG_TIS_CORE=y
 CONFIG_TCG_TIS=y
 CONFIG_SECURITYFS=y
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg new file +6 -0
new file mode 100644
index 0000000..a81b54d
@@ -0,0 +1,6 @@
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TPM=y
+CONFIG_TCG_TIS_CORE=y
+CONFIG_TCG_TIS=y
+CONFIG_TCG_CRB=y
+CONFIG_SECURITYFS=y
meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc new file +3 -0
new file mode 100644
index 0000000..088148f
@@ -0,0 +1,3 @@
+define KFEATURE_DESCRIPTION "Enable TPM 2.0"
+
+kconf hardware tpm2.cfg
meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend +6 -0
index 0eebf00..cea8b1b 100644
@@ -3,6 +3,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
 # Enable tpm in kernel 
 SRC_URI_append_x86 = " \
     ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.scc', '', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'file://tpm2.scc', '', d)} \
+    "
+
+SRC_URI_append_x86-64 = " \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.scc', '', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'file://tpm2.scc', '', d)} \
     "
 
 SRC_URI += " \
Signature · 1 line
2.7.4
#10 lore raw

PATCH 10/10 tpm2: package groups fixes

In reply to Armin Kuster
---
 .../packagegroup/packagegroup-security-tpm-i2c.bb         |  2 ++
 .../packagegroup/packagegroup-security-tpm.bb             | 15 +++++++++++++++
 .../packagegroup/packagegroup-security-tpm2.bb            |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)
meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb +2 -0
index d4c3bb7..d3d9ebc 100644
@@ -9,6 +9,8 @@ PACKAGES = "packagegroup-security-tpm-i2c"
 
 SUMMARY_packagegroup-security-tpm-i2c = "Security TPM i2c support"
 RDEPENDS_packagegroup-security-tpm-i2c = " \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'packagegroup-security-tpm', '', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2, '', d)} \
     kernel-module-tpm-i2c-atmel \
     kernel-module-tpm-i2c-infineon \
     kernel-module-tpm-i2c-nuvoton \
meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb +15 -0
index 2412348..2db8521 100644
@@ -11,4 +11,19 @@ SUMMARY_packagegroup-security-tpm = "Security TPM support"
 RDEPENDS_packagegroup-security-tpm = " \
     tpm-tools \
     trousers \
+    ${X86_TPM_MODULES} \
+    "
+
+X86_TPM_MODULES ?= ""
+
+X86_TPM_MODULES_x86 = " \
+    kernel-module-tpm-atmel \
+    kernel-module-tpm-infineon \
+    kernel-module-tpm-nsc \
+    "
+
+X86_TPM_MODULES_x86-64 = " \
+    kernel-module-tpm-atmel \
+    kernel-module-tpm-infineon \
+    kernel-module-tpm-nsc \
     "
meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb +1 -1
index 1c96cbe..57b0722 100644
@@ -10,9 +10,9 @@ PACKAGES = "packagegroup-security-tpm2"
 SUMMARY_packagegroup-security-tpm2 = "Security TPM 2.0 support"
 RDEPENDS_packagegroup-security-tpm2 = " \
     tpm2.0-tools \
+    trousers \
     libtss2 \
     libtctidevice \
     libtctisocket \
     resourcemgr \
-    kernel-module-tpm-crb \
     "
Signature · 1 line
2.7.4
#11 lore raw
In reply to Armin Kuster

Armin,

very interesting move. Could you tell us where is located your git repo ?
Regards

Dominig

Le 09/05/2017 à 16:46, Armin Kuster a écrit :
tpm recipes copied as-is This was done to allow inclusion of TPM components independent of the rest of the layer. minimizes layerdepends fixed incorrect use of DISTRO_FEATURES Updated tpm kernel configs to newer version added a few new packagegroups Armin Kuster (10): tpm: move to a sub layer change tpm from distro to machine feature meta-tpm: add base package group as was in meta-security packagegroup: remove tpm components tpm packagegroups: split into logical units tpm-i2c: some systems us i2c TPM kernel tpm rework tpm-image: used for testing for now. linux-stable: fix module selections tpm2: package groups fixes meta-tpm/README | 0 meta-tpm/conf/layer.conf | 13 ++++++++++ meta-tpm/recipes-core/images/security-tpm-image.bb | 19 ++++++++++++++ .../packagegroup/packagegroup-security-tpm-i2c.bb | 19 ++++++++++++++ .../packagegroup/packagegroup-security-tpm.bb | 29 ++++++++++++++++++++++ .../packagegroup/packagegroup-security-tpm2.bb | 18 ++++++++++++++ .../packagegroup/packagegroup-security-vtpm.bb | 14 +++++++++++ meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg | 8 ++++++ meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc | 3 +++ meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg | 6 +++++ meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc | 3 +++ .../recipes-kernel/linux/linux-yocto/tpm_i2c.cfg | 15 +++++++++++ .../recipes-kernel/linux/linux-yocto/tpm_i2c.scc | 6 +++++ .../recipes-kernel/linux/linux-yocto/tpm_x86.cfg | 4 +++ meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg | 5 ++++ meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc | 4 +++ .../recipes-kernel/linux/linux-yocto_4.%.bbappend | 17 +++++++++++++ .../Convert-another-vdprintf-to-dprintf.patch | 0 .../files/Use-format-s-for-call-to-dprintf.patch | 0 .../libtpm/files/fix_signed_issue.patch | 0 .../recipes-tpm}/libtpm/libtpm_1.0.bb | 0 .../recipes-tpm}/swtpm/files/fix_fcntl_h.patch | 0 .../swtpm/files/fix_lib_search_path.patch | 0 .../swtpm/files/fix_signed_issue.patch | 0 .../recipes-tpm}/swtpm/files/ioctl_h.patch | 0 .../recipes-tpm}/swtpm/swtpm-wrappers-native.bb | 0 .../recipes-tpm}/swtpm/swtpm_1.0.bb | 0 .../tpm-tools/files/tpm-tools-extendpcr.patch | 0 .../recipes-tpm}/tpm-tools/tpm-tools_git.bb | 0 .../recipes-tpm}/tpm2.0-tools/tpm2.0-tools_git.bb | 0 .../tpm2.0-tss/tpm2.0-tss/ax_pthread.m4 | 0 .../tpm2.0-tss/fix_musl_select_include.patch | 0 .../recipes-tpm}/tpm2.0-tss/tpm2.0-tss_git.bb | 0 .../tpm2simulator/tpm2simulator-native_116.bb | 0 ...path-use-POSIX-getpwent-instead-of-getpwe.patch | 0 .../recipes-tpm}/trousers/files/tcsd.service | 0 .../trousers/files/trousers-udev.rules | 0 .../recipes-tpm}/trousers/files/trousers.init.sh | 0 .../recipes-tpm}/trousers/trousers_git.bb | 0 recipes-kernel/linux/linux-yocto_4.10.bbappend | 3 --- .../packagegroup/packagegroup-core-security.bb | 18 ++------------ 41 files changed, 185 insertions(+), 19 deletions(-) create mode 100644 meta-tpm/README create mode 100644 meta-tpm/conf/layer.conf create mode 100644 meta-tpm/recipes-core/images/security-tpm-image.bb create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/files/Convert-another-vdprintf-to-dprintf.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/files/Use-format-s-for-call-to-dprintf.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/files/fix_signed_issue.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/libtpm_1.0.bb (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/fix_fcntl_h.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/fix_lib_search_path.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/fix_signed_issue.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/ioctl_h.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/swtpm-wrappers-native.bb (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/swtpm_1.0.bb (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm-tools/files/tpm-tools-extendpcr.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm-tools/tpm-tools_git.bb (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tools/tpm2.0-tools_git.bb (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4 (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tss/tpm2.0-tss_git.bb (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2simulator/tpm2simulator-native_116.bb (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/tcsd.service (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/trousers-udev.rules (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/trousers.init.sh (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/trousers_git.bb (100%) -- Dominig ar Foll Senior Software Architect Intel Open Source Technology Centre

#12 lore raw
Quoted 3 lines · Dominig ar Foll (Intel Open Source)

Armin,

very interesting move. Could you tell us where is located your git repo ?

http://git.yoctoproject.org/cgit/cgit.cgi/meta-security/

currently the changes are in master-next

- armin

Quoted 117 lines

Regards

Dominig

Quoted 105 lines · Armin Kuster

tpm recipes copied as-is

This was done to allow inclusion of TPM components independent of the rest of the layer. minimizes layerdepends

fixed incorrect use of DISTRO_FEATURES

Updated tpm kernel configs to newer version

added a few new packagegroups

Armin Kuster (10):
tpm: move to a sub layer
change tpm from distro to machine feature
meta-tpm: add base package group as was in meta-security
packagegroup: remove tpm components
tpm packagegroups: split into logical units
tpm-i2c: some systems us i2c TPM
kernel tpm rework
tpm-image: used for testing for now.
linux-stable: fix module selections
tpm2: package groups fixes

  meta-tpm/README                                    |  0
  meta-tpm/conf/layer.conf                           | 13 ++++++++++
  meta-tpm/recipes-core/images/security-tpm-image.bb | 19 ++++++++++++++
  .../packagegroup/packagegroup-security-tpm-i2c.bb  | 19 ++++++++++++++
  .../packagegroup/packagegroup-security-tpm.bb      | 29 ++++++++++++++++++++++
  .../packagegroup/packagegroup-security-tpm2.bb     | 18 ++++++++++++++
  .../packagegroup/packagegroup-security-vtpm.bb     | 14 +++++++++++
  meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg  |  8 ++++++
  meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc  |  3 +++
  meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg |  6 +++++
  meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc |  3 +++
  .../recipes-kernel/linux/linux-yocto/tpm_i2c.cfg   | 15 +++++++++++
  .../recipes-kernel/linux/linux-yocto/tpm_i2c.scc   |  6 +++++
  .../recipes-kernel/linux/linux-yocto/tpm_x86.cfg   |  4 +++
  meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg |  5 ++++
  meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc |  4 +++
  .../recipes-kernel/linux/linux-yocto_4.%.bbappend  | 17 +++++++++++++
  .../Convert-another-vdprintf-to-dprintf.patch      |  0
  .../files/Use-format-s-for-call-to-dprintf.patch   |  0
  .../libtpm/files/fix_signed_issue.patch            |  0
  .../recipes-tpm}/libtpm/libtpm_1.0.bb              |  0
  .../recipes-tpm}/swtpm/files/fix_fcntl_h.patch     |  0
  .../swtpm/files/fix_lib_search_path.patch          |  0
  .../swtpm/files/fix_signed_issue.patch             |  0
  .../recipes-tpm}/swtpm/files/ioctl_h.patch         |  0
  .../recipes-tpm}/swtpm/swtpm-wrappers-native.bb    |  0
  .../recipes-tpm}/swtpm/swtpm_1.0.bb                |  0
  .../tpm-tools/files/tpm-tools-extendpcr.patch      |  0
  .../recipes-tpm}/tpm-tools/tpm-tools_git.bb        |  0
  .../recipes-tpm}/tpm2.0-tools/tpm2.0-tools_git.bb  |  0
  .../tpm2.0-tss/tpm2.0-tss/ax_pthread.m4            |  0
  .../tpm2.0-tss/fix_musl_select_include.patch       |  0
  .../recipes-tpm}/tpm2.0-tss/tpm2.0-tss_git.bb      |  0
  .../tpm2simulator/tpm2simulator-native_116.bb      |  0
  ...path-use-POSIX-getpwent-instead-of-getpwe.patch |  0
  .../recipes-tpm}/trousers/files/tcsd.service       |  0
  .../trousers/files/trousers-udev.rules             |  0
  .../recipes-tpm}/trousers/files/trousers.init.sh   |  0
  .../recipes-tpm}/trousers/trousers_git.bb          |  0
  recipes-kernel/linux/linux-yocto_4.10.bbappend     |  3 ---
  .../packagegroup/packagegroup-core-security.bb     | 18 ++------------
  41 files changed, 185 insertions(+), 19 deletions(-)

create mode 100644 meta-tpm/README
create mode 100644 meta-tpm/conf/layer.conf
create mode 100644 meta-tpm/recipes-core/images/security-tpm-image.bb
create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb
create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb
create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb
create mode 100644 meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb
create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg
create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc
create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg
create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc
create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg
create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc
create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg
create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg
create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc
create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend
rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/files/Convert-another-vdprintf-to-dprintf.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/files/Use-format-s-for-call-to-dprintf.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/files/fix_signed_issue.patch (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/libtpm/libtpm_1.0.bb (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/fix_fcntl_h.patch (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/fix_lib_search_path.patch (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/fix_signed_issue.patch (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/files/ioctl_h.patch (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/swtpm-wrappers-native.bb (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/swtpm/swtpm_1.0.bb (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm-tools/files/tpm-tools-extendpcr.patch (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm-tools/tpm-tools_git.bb (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tools/tpm2.0-tools_git.bb (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4 (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2.0-tss/tpm2.0-tss_git.bb (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/tpm2simulator/tpm2simulator-native_116.bb (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch (100%) rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/tcsd.service (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/trousers-udev.rules (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/files/trousers.init.sh (100%)
rename {recipes-tpm => meta-tpm/recipes-tpm}/trousers/trousers_git.bb (100%)

Signature · 3 lines
Dominig ar Foll
Senior Software Architect
Intel Open Source Technology Centre