swtpm: fix cuse depends
PATCH 1/2 swtpm: fix cuse depends
if cuse is enabled, depend on fuse which is in meta-filesystems throw error is layer is missing.
Signed-off-by Armin Kuster <[email protected]>
--- meta-tpm/recipes-tpm/swtpm/swtpm_1.0.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
meta-tpm/recipes-tpm/swtpm/swtpm_1.0.bb +8 -2
@@ -3,7 +3,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=fe8092c832b71ef20dfe4c6d3decb3a8" SECTION = "apps" -DEPENDS = "libtasn1 fuse expect socat glib-2.0 libtpm libtpm-native" +DEPENDS = "libtasn1 expect socat glib-2.0 libtpm libtpm-native" # configure checks for the tools already during compilation and # then swtpm_setup needs them at runtime
@@ -32,7 +32,7 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" PACKAGECONFIG[gnutls] = "--with-gnutls, --without-gnutls, gnutls" PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux" -PACKAGECONFIG[cuse] = "--with-cuse, --without-cuse" +PACKAGECONFIG[cuse] = "--with-cuse, --without-cuse, fuse" EXTRA_OECONF += "--with-tss-user=${TSS_USER} --with-tss-group=${TSS_GROUP}"
@@ -55,3 +55,9 @@ USERADD_PARAM_${PN} = "--system -g ${TSS_GROUP} --home-dir \ RDEPENDS_${PN} = "libtpm expect socat bash" BBCLASSEXTEND = "native nativesdk" + +python() { + if 'cuse' in d.getVar('PACKAGECONFIG') and \ + 'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split(): + raise bb.parse.SkipRecipe('Cuse enabled which requires meta-filesystems to be present.') +}
Signature · 1 line
2.7.4
PATCH 2/2 README: update with basic info
needed to pass yocto-check-layer
Signed-off-by Armin Kuster <[email protected]>
--- meta-tpm/README | 4 ++++ 1 file changed, 4 insertions(+)
meta-tpm/README +4 -0
@@ -0,0 +1,4 @@ +meta-tpm layer +============== + +This layer contains base TPM recipes.
Signature · 1 line
2.7.4