mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-06-02 13:30:33 +00:00
Code Issues Projects Releases Wiki Activity

swtpm: switch to stable branch and clean up recipe

Browse Source 
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2018-10-27 04:16:26 +01:00
parent b15dbacb32
commit 57cac8ede6
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-tpm/recipes-tpm/swtpm/swtpm_1.0.bb
+5 -17
View File
@@ -3,22 +3,21 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fe8092c832b71ef20dfe4c6d3decb3a8" LIC_FILES_CHKSUM = "file://LICENSE;md5=fe8092c832b71ef20dfe4c6d3decb3a8"
SECTION = "apps" SECTION = "apps"
DEPENDS = "libtasn1 expect socat glib-2.0 libtpm libtpm-native" DEPENDS = "libtasn1 expect socat glib-2.0 net-tools-native libtpm libtpm-native"
# configure checks for the tools already during compilation and # configure checks for the tools already during compilation and
# then swtpm_setup needs them at runtime # then swtpm_setup needs them at runtime
DEPENDS += "tpm-tools-native expect-native socat-native" DEPENDS += "tpm-tools-native expect-native socat-native"
SRCREV = "66b42f52ef363998cb57f039889d59381d20bdf1" SRCREV = "94bb9f2d716d09bcc6cd2a2e033018f8592008e7"
SRC_URI = "git://github.com/stefanberger/swtpm.git \ SRC_URI = "git://github.com/stefanberger/swtpm.git;branch=tpm2-preview.v2 \
file://fix_lib_search_path.patch \
file://fix_fcntl_h.patch \ file://fix_fcntl_h.patch \
file://ioctl_h.patch \ file://ioctl_h.patch \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit autotools-brokensep pkgconfig inherit autotools pkgconfig
PARALLEL_MAKE = "" PARALLEL_MAKE = ""
TSS_USER="tss" TSS_USER="tss"
@@ -35,21 +34,12 @@ EXTRA_OECONF += "--with-tss-user=${TSS_USER} --with-tss-group=${TSS_GROUP}"
export SEARCH_DIR = "${STAGING_LIBDIR_NATIVE}" export SEARCH_DIR = "${STAGING_LIBDIR_NATIVE}"
# dup bootstrap
do_configure_prepend () {
libtoolize --force --copy
autoheader
aclocal
automake --add-missing -c
autoconf
}
USERADD_PACKAGES = "${PN}" USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "--system ${TSS_USER}" GROUPADD_PARAM_${PN} = "--system ${TSS_USER}"
USERADD_PARAM_${PN} = "--system -g ${TSS_GROUP} --home-dir \ USERADD_PARAM_${PN} = "--system -g ${TSS_GROUP} --home-dir \
--no-create-home --shell /bin/false ${BPN}" --no-create-home --shell /bin/false ${BPN}"
RDEPENDS_${PN} = "libtpm expect socat bash" RDEPENDS_${PN} = "libtpm expect socat bash tpm-tools"
BBCLASSEXTEND = "native nativesdk" BBCLASSEXTEND = "native nativesdk"
@@ -58,5 +48,3 @@ python() {
'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split(): 'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split():
raise bb.parse.SkipRecipe('Cuse enabled which requires meta-filesystems to be present.') raise bb.parse.SkipRecipe('Cuse enabled which requires meta-filesystems to be present.')
} }
RDEPENDS_${PN} += "tpm-tools"