From 3529cfb43e47015aa0621755e7b6536b7947d295 Mon Sep 17 00:00:00 2001 From: Mikko Rapeli Date: Mon, 30 Jan 2023 13:01:06 +0200 Subject: linux-yocto: drop version from bbappends These bbappends apply to multiple kernel versions so no need to make them version dependent. Fixes recipe parsing when using meta-security master branch on kirkstone. In our custom layer we set layer compatibility for kirkstone and I understand why meta-security upstream would not want to do that: LAYERSERIES_COMPAT_security-layer += 'kirkstone' LAYERSERIES_COMPAT_parsec-layer += 'kirkstone' LAYERSERIES_COMPAT_tpm-layer += 'kirkstone' While I work towards supporting also yocto master branch and newer releases than kirkstone, I would appreciate if I would not have to branch off layers over minor details like this. Signed-off-by: Mikko Rapeli Signed-off-by: Armin Kuster --- meta-tpm/recipes-kernel/linux/linux-yocto_%.bbappend | 1 + meta-tpm/recipes-kernel/linux/linux-yocto_6.%.bbappend | 1 - recipes-kernel/linux/linux-yocto_%.bbappend | 1 + recipes-kernel/linux/linux-yocto_6.%.bbappend | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto_%.bbappend delete mode 100644 meta-tpm/recipes-kernel/linux/linux-yocto_6.%.bbappend create mode 100644 recipes-kernel/linux/linux-yocto_%.bbappend delete mode 100644 recipes-kernel/linux/linux-yocto_6.%.bbappend diff --git a/meta-tpm/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-tpm/recipes-kernel/linux/linux-yocto_%.bbappend new file mode 100644 index 0000000..e8027ff --- /dev/null +++ b/meta-tpm/recipes-kernel/linux/linux-yocto_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains_any('DISTRO_FEATURES', 'tpm tpm2', 'linux-yocto_tpm.inc', '', d)} diff --git a/meta-tpm/recipes-kernel/linux/linux-yocto_6.%.bbappend b/meta-tpm/recipes-kernel/linux/linux-yocto_6.%.bbappend deleted file mode 100644 index e8027ff..0000000 --- a/meta-tpm/recipes-kernel/linux/linux-yocto_6.%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains_any('DISTRO_FEATURES', 'tpm tpm2', 'linux-yocto_tpm.inc', '', d)} diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend new file mode 100644 index 0000000..1d9054f --- /dev/null +++ b/recipes-kernel/linux/linux-yocto_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('DISTRO_FEATURES', 'security', '${BPN}_security.inc', '', d)} diff --git a/recipes-kernel/linux/linux-yocto_6.%.bbappend b/recipes-kernel/linux/linux-yocto_6.%.bbappend deleted file mode 100644 index 1d9054f..0000000 --- a/recipes-kernel/linux/linux-yocto_6.%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'security', '${BPN}_security.inc', '', d)} -- cgit v1.2.3-54-g00ecf