From 4d98ee98d21e9a42ddd665901aa120e56b026698 Mon Sep 17 00:00:00 2001 From: Lans Zhang Date: Thu, 20 Jul 2017 16:13:07 +0800 Subject: meta-tpm2: code style fixup Signed-off-by: Lans Zhang --- meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2-initramfs.bb | 2 +- meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.bb | 2 +- meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.inc | 5 ++++- meta-tpm2/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend | 2 +- meta-tpm2/recipes-kernel/linux/linux-yocto-tpm2.inc | 2 +- meta-tpm2/recipes-kernel/linux/linux-yocto_4.%.bbappend | 2 +- 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 @@ -include packagegroup-tpm2.inc +require packagegroup-tpm2.inc RDEPENDS_${PN} += "\ 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 @@ DESCRIPTION = "Packagegroup for TPM2 TCG TSS userspace and utilities." LICENSE = "MIT" -PR = "r0" +LIC_FILES_CHKSUM = "\ + file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ +" inherit 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:" -SRC_URI += " \ +SRC_URI += "\ ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', \ 'file://tpm2.scc file://tpm2.cfg', '', d)} \ " 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 -- cgit v1.2.3-54-g00ecf