From 7174b0c4b33f945fad29bea070916881d6088de4 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 17 Apr 2024 15:58:48 +0800 Subject: [PATCH] README: remove meta-tpm The meta-tpm layer has been removed. Signed-off-by: Yi Zhao --- README | 7 ++----- README.md | 4 ---- meta-integrity/README.md | 5 ----- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/README b/README index cf91cfb..879fb4e 100644 --- a/README +++ b/README @@ -53,7 +53,6 @@ other layers needed. e.g.: /path/to/yocto/meta-yocto-bsp \ /path/to/yocto/meta-secure-core/meta-secure-core-common \ /path/to/yocto/meta-secure-core/meta-signing-key \ - /path/to/yocto/meta-secure-core/meta-tpm \ /path/to/yocto/meta-secure-core/meta-tpm2 \ /path/to/yocto/meta-secure-core/meta-efi-secure-boot \ /path/to/yocto/meta-secure-core/meta-integrity \ @@ -64,7 +63,6 @@ or run bitbake-layers to add the meta-secure-core and its sub-layers: $ bitbake-layers add-layer /path/to/yocto/meta-secure-core/meta-secure-core-common $ bitbake-layers add-layer /path/to/yocto/meta-secure-core/meta-signing-key - $ bitbake-layers add-layer /path/to/yocto/meta-secure-core/meta-tpm $ bitbake-layers add-layer /path/to/yocto/meta-secure-core/meta-tpm2 $ bitbake-layers add-layer /path/to/yocto/meta-secure-core/meta-efi-secure-boot $ bitbake-layers add-layer /path/to/yocto/meta-secure-core/meta-integrity @@ -77,15 +75,14 @@ The full features in meta-secure-core can be configured with these definitions in local.conf: INITRAMFS_IMAGE = "secure-core-image-initramfs" -DISTRO_FEATURES_NATIVE:append = " systemd ima tpm tpm2 efi-secure-boot luks" -DISTRO_FEATURES:append = " systemd ima tpm tpm2 efi-secure-boot luks modsign" +DISTRO_FEATURES_NATIVE:append = " systemd ima tpm2 efi-secure-boot luks" +DISTRO_FEATURES:append = " systemd ima tpm2 efi-secure-boot luks modsign" MACHINE_FEATURES_NATIVE:append = " efi" MACHINE_FEATURES:append = " efi" PACKAGE_CLASSES = "package_rpm" INHERIT += "sign_rpm_ext" SECURE_CORE_IMAGE_EXTRA_INSTALL ?= "\ packagegroup-efi-secure-boot \ - packagegroup-tpm \ packagegroup-tpm2 \ packagegroup-ima \ packagegroup-luks \ diff --git a/README.md b/README.md index 4b25bbf..965bb29 100644 --- a/README.md +++ b/README.md @@ -21,10 +21,6 @@ the purposes of development and demonstration. It is not recommended that this sample key be used for a production device and should be replaced by a secret key owned by the user. -#### TPM 1.x -This feature enables Trusted Platform Module 1.x support, including -kernel option changes to enable tpm drivers, and picking up TPM 1.x packages. - #### TPM 2.0 This feature enables Trusted Platform Module 2.0 support, including kernel option changes to enable tpm drivers, and picking up TPM 2.0 packages. diff --git a/meta-integrity/README.md b/meta-integrity/README.md index de0669c..5535736 100644 --- a/meta-integrity/README.md +++ b/meta-integrity/README.md @@ -55,9 +55,6 @@ and network file systems, such as NFS, don't support extended attribute, meaning IMA appraisal is not available with them. ##### Dependency -- [meta-tpm](https://github.com/Wind-River/meta-secure-core/tree/master/meta-tpm) - This layer provides the kernel configurations and TSS for TPM 1.x enablement. - - [meta-tpm2](https://github.com/Wind-River/meta-secure-core/tree/master/meta-tpm2) This layer provides the kernel configurations and TSS for TPM 2.0 enablement. @@ -203,6 +200,4 @@ Maintainer: Yi Zhao [OpenEmbedded layer for signing key management](https://github.com/Wind-River/meta-secure-core/tree/master/meta-signing-key) -[OpenEmbedded layer for TPM 1.x](https://github.com/Wind-River/meta-secure-core/tree/master/meta-tpm) - [OpenEmbedded layer for TPM 2.0](https://github.com/Wind-River/meta-secure-core/tree/master/meta-tpm2)