From 215174b60c0b7f96af17fb6bb2f9aacbbfe0b655 Mon Sep 17 00:00:00 2001 From: Mikko Rapeli Date: Fri, 9 Dec 2022 14:05:41 +0000 Subject: [PATCH] linux-yocto*: fix require of include file There exists only linux-yocto-tpm2.inc. BPN will resolve to linux-yocto-rt and linux-yocto-dev which don't have a recipe specific include files. Fixes bitbake recipe parsing errors like: ERROR: ParseError at /home/builder/src/build/../meta-secure-core/meta-tpm2/recipes-kernel/linux/linux-yocto-rt_5.%.bbappend:1: Could not include required file linux-yocto-rt-tpm2.inc ERROR: Parsing halted due to errors, see error messages above Signed-off-by: Mikko Rapeli --- meta-tpm2/recipes-kernel/linux/linux-yocto-dev.bbappend | 2 +- meta-tpm2/recipes-kernel/linux/linux-yocto-rt_5.%.bbappend | 2 +- meta-tpm2/recipes-kernel/linux/linux-yocto_5.%.bbappend | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-tpm2/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-tpm2/recipes-kernel/linux/linux-yocto-dev.bbappend index 3625e8c..695e57a 100644 --- a/meta-tpm2/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-tpm2/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1 +1 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', '${BPN}-tpm2.inc', '', d)} +require ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'linux-yocto-tpm2.inc', '', d)} diff --git a/meta-tpm2/recipes-kernel/linux/linux-yocto-rt_5.%.bbappend b/meta-tpm2/recipes-kernel/linux/linux-yocto-rt_5.%.bbappend index 3625e8c..695e57a 100644 --- a/meta-tpm2/recipes-kernel/linux/linux-yocto-rt_5.%.bbappend +++ b/meta-tpm2/recipes-kernel/linux/linux-yocto-rt_5.%.bbappend @@ -1 +1 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', '${BPN}-tpm2.inc', '', d)} +require ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'linux-yocto-tpm2.inc', '', d)} diff --git a/meta-tpm2/recipes-kernel/linux/linux-yocto_5.%.bbappend b/meta-tpm2/recipes-kernel/linux/linux-yocto_5.%.bbappend index 3625e8c..695e57a 100644 --- a/meta-tpm2/recipes-kernel/linux/linux-yocto_5.%.bbappend +++ b/meta-tpm2/recipes-kernel/linux/linux-yocto_5.%.bbappend @@ -1 +1 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', '${BPN}-tpm2.inc', '', d)} +require ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'linux-yocto-tpm2.inc', '', d)}