summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLans Zhang <jia.zhang@windriver.com>2017-07-20 16:13:07 +0800
committerLans Zhang <jia.zhang@windriver.com>2017-07-20 16:13:07 +0800
commit4d98ee98d21e9a42ddd665901aa120e56b026698 (patch)
treea1fbbc287949215c3a23d5d55db2c080a590047e
parentb2ace92dafc821feba12b2e2136923763256ba2e (diff)
downloadmeta-secure-core-4d98ee98d21e9a42ddd665901aa120e56b026698.tar.gz
meta-tpm2: code style fixup
Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
-rw-r--r--meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2-initramfs.bb2
-rw-r--r--meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.bb2
-rw-r--r--meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.inc5
-rw-r--r--meta-tpm2/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend2
-rw-r--r--meta-tpm2/recipes-kernel/linux/linux-yocto-tpm2.inc2
-rw-r--r--meta-tpm2/recipes-kernel/linux/linux-yocto_4.%.bbappend2
6 files changed, 9 insertions, 6 deletions
diff --git a/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2-initramfs.bb b/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2-initramfs.bb
index 87c811a..71222ab 100644
--- a/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2-initramfs.bb
+++ b/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2-initramfs.bb
@@ -1 +1 @@
include packagegroup-tpm2.inc require packagegroup-tpm2.inc
diff --git a/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.bb b/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.bb
index b0dc843..96cddd3 100644
--- a/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.bb
+++ b/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.bb
@@ -1,4 +1,4 @@
1include packagegroup-tpm2.inc 1require packagegroup-tpm2.inc
2 2
3RDEPENDS_${PN} += "\ 3RDEPENDS_${PN} += "\
4 tpm2-abrmd \ 4 tpm2-abrmd \
diff --git a/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.inc b/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.inc
index 9ffca61..d19db9e 100644
--- a/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.inc
+++ b/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.inc
@@ -1,5 +1,8 @@
1DESCRIPTION = "Packagegroup for TPM2 TCG TSS userspace and utilities." 1DESCRIPTION = "Packagegroup for TPM2 TCG TSS userspace and utilities."
2LICENSE = "MIT" 2LICENSE = "MIT"
3PR = "r0" 3LIC_FILES_CHKSUM = "\
4 file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
5 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \
6"
4 7
5inherit packagegroup 8inherit packagegroup
diff --git a/meta-tpm2/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend b/meta-tpm2/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend
index edaf7f3..8be9378 100644
--- a/meta-tpm2/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend
+++ b/meta-tpm2/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend
@@ -1 +1 @@
include linux-yocto-tpm2.inc require linux-yocto-tpm2.inc
diff --git a/meta-tpm2/recipes-kernel/linux/linux-yocto-tpm2.inc b/meta-tpm2/recipes-kernel/linux/linux-yocto-tpm2.inc
index 32456ca..51ab57e 100644
--- a/meta-tpm2/recipes-kernel/linux/linux-yocto-tpm2.inc
+++ b/meta-tpm2/recipes-kernel/linux/linux-yocto-tpm2.inc
@@ -1,6 +1,6 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
2 2
3SRC_URI += " \ 3SRC_URI += "\
4 ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', \ 4 ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', \
5 'file://tpm2.scc file://tpm2.cfg', '', d)} \ 5 'file://tpm2.scc file://tpm2.cfg', '', d)} \
6" 6"
diff --git a/meta-tpm2/recipes-kernel/linux/linux-yocto_4.%.bbappend b/meta-tpm2/recipes-kernel/linux/linux-yocto_4.%.bbappend
index edaf7f3..8be9378 100644
--- a/meta-tpm2/recipes-kernel/linux/linux-yocto_4.%.bbappend
+++ b/meta-tpm2/recipes-kernel/linux/linux-yocto_4.%.bbappend
@@ -1 +1 @@
include linux-yocto-tpm2.inc require linux-yocto-tpm2.inc