From 5ff27eec489c4524aa2ccf5671d14feb7d52bae2 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Tue, 25 Apr 2017 11:14:02 +0200 Subject: swtpm-wrappers: fix naming convention violation Native recipes must be called -native. This is more than just a recommendation, there's actual code which checks for the suffix. Not following that rule broke swtpm-wrappers when using the "usrmerge" DISTRO_FEATURE, because the code in native.bbclass which cleans up DISTRO_FEATURES for native recipes was skipped and thus swtpm-wrappers ended up using different paths than the other native recipes. Signed-off-by: Patrick Ohly Signed-off-by: Armin Kuster --- recipes-tpm/swtpm/swtpm-wrappers-native.bb | 53 ++++++++++++++++++++++++++++++ recipes-tpm/swtpm/swtpm-wrappers.bb | 53 ------------------------------ 2 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 recipes-tpm/swtpm/swtpm-wrappers-native.bb delete mode 100644 recipes-tpm/swtpm/swtpm-wrappers.bb diff --git a/recipes-tpm/swtpm/swtpm-wrappers-native.bb b/recipes-tpm/swtpm/swtpm-wrappers-native.bb new file mode 100644 index 0000000..0af1db6 --- /dev/null +++ b/recipes-tpm/swtpm/swtpm-wrappers-native.bb @@ -0,0 +1,53 @@ +SUMMARY = "SWTPM - OpenEmbedded wrapper scripts for native swtpm tools" +LICENSE = "MIT" +DEPENDS = "swtpm-native tpm-tools-native" + +inherit native + +# The whole point of the recipe is to make files available +# for use after the build is done, so don't clean up... +RM_WORK_EXCLUDE += "${PN}" + +do_create_wrapper () { + # Wrap (almost) all swtpm binaries. Some get special wrappers and some + # are not needed. + for i in `find ${bindir} ${base_bindir} ${sbindir} ${base_sbindir} -name 'swtpm*' -perm /+x -type f`; do + exe=`basename $i` + case $exe in + swtpm_setup.sh) + cat >${WORKDIR}/swtpm_setup_oe.sh <${WORKDIR}/${exe}_oe.sh <${WORKDIR}/swtpm_setup_oe.sh <${WORKDIR}/${exe}_oe.sh <