mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-05-07 04:58:47 +00:00
Code Issues Projects Releases Wiki Activity

meta-tpm: Convert to new override syntax

Browse Source 
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2021-07-29 16:31:50 -07:00
parent 11a67b861a
commit c7632b927c
17 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-tpm/README
+1 -1
View File
@@ -5,7 +5,7 @@ The bbappend files for some recipes (e.g. linux-yocto) in this layer need
to have 'tpm' in DISTRO_FEATURES to have effect. to have 'tpm' in DISTRO_FEATURES to have effect.
To enable them, add in configuration file the following line. To enable them, add in configuration file the following line.
DISTRO_FEATURES_append = " tmp" DISTRO_FEATURES:append = " tmp"
If meta-tpm is included, but tpm is not enabled as a If meta-tpm is included, but tpm is not enabled as a
distro feature a warning is printed at parse time: distro feature a warning is printed at parse time:
meta-tpm/conf/distro/include/maintainers.inc
+17 -17
View File
@@ -16,23 +16,23 @@
# #
# The format is as a bitbake variable override for each recipe # The format is as a bitbake variable override for each recipe
# #
# RECIPE_MAINTAINER_pn-<recipe name> = "Full Name <address@domain>" # RECIPE_MAINTAINER:pn-<recipe name> = "Full Name <address@domain>"
# #
# Please keep this list in alphabetical order. # Please keep this list in alphabetical order.
RECIPE_MAINTAINER_pn-aircrack-ng = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-aircrack-ng = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-pcr-extend = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-pcr-extend = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-tpm-quote-tools = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-tpm-quote-tools = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-libtpm = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-libtpm = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-trousers = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-trousers = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-swtpm = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-swtpm = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-openssl-tpm-engine = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-openssl-tpm-engine = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-tpm-tools = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-tpm-tools = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-tpm2-abrmd = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-tpm2-abrmd = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-tpm2-totp = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-tpm2-totp = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-tpm2-tcti-uefi = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-tpm2-tcti-uefi = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-tpm2-tss-engine = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-tpm2-tss-engine = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-tpm2-pkcs11 = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-tpm2-pkcs11 = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-tpm2-tss = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-tpm2-tss = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-tpm2-tools = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-tpm2-tools = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-ibmswtpm2 = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER:pn-ibmswtpm2 = "Armin Kuster <akuster808@gmail.com>"
meta-tpm/dynamic-layers/meta-networking/recipes-support/strongswan/strongswan-tpm.inc
+2 -2
View File
@@ -1,8 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
DEPENDS = "libtspi" DEPENDS = "libtspi"
SRC_URI_append = " file://0001-xfrmi-Only-build-if-libcharon-is-built.patch" SRC_URI:append = " file://0001-xfrmi-Only-build-if-libcharon-is-built.patch"
PACKAGECONFIG += "aikgen tpm" PACKAGECONFIG += "aikgen tpm"
meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb
+2 -2
View File
@@ -7,8 +7,8 @@ inherit packagegroup
PACKAGES = "packagegroup-security-tpm-i2c" PACKAGES = "packagegroup-security-tpm-i2c"
SUMMARY_packagegroup-security-tpm-i2c = "Security TPM i2c support" SUMMARY:packagegroup-security-tpm-i2c = "Security TPM i2c support"
RDEPENDS_packagegroup-security-tpm-i2c = " \ RDEPENDS:packagegroup-security-tpm-i2c = " \
${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'packagegroup-security-tpm', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'packagegroup-security-tpm', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2', '', d)} \
kernel-module-tpm-i2c-atmel \ kernel-module-tpm-i2c-atmel \
meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb
+4 -4
View File
@@ -7,8 +7,8 @@ inherit packagegroup
PACKAGES = "packagegroup-security-tpm" PACKAGES = "packagegroup-security-tpm"
SUMMARY_packagegroup-security-tpm = "Security TPM support" SUMMARY:packagegroup-security-tpm = "Security TPM support"
RDEPENDS_packagegroup-security-tpm = " \ RDEPENDS:packagegroup-security-tpm = " \
tpm-tools \ tpm-tools \
trousers \ trousers \
pcr-extend \ pcr-extend \
@@ -21,13 +21,13 @@ RDEPENDS_packagegroup-security-tpm = " \
X86_TPM_MODULES ?= "" X86_TPM_MODULES ?= ""
X86_TPM_MODULES_x86 = " \ X86_TPM_MODULES:x86 = " \
kernel-module-tpm-atmel \ kernel-module-tpm-atmel \
kernel-module-tpm-infineon \ kernel-module-tpm-infineon \
kernel-module-tpm-nsc \ kernel-module-tpm-nsc \
" "
X86_TPM_MODULES_x86-64 = " \ X86_TPM_MODULES:x86-64 = " \
kernel-module-tpm-atmel \ kernel-module-tpm-atmel \
kernel-module-tpm-infineon \ kernel-module-tpm-infineon \
kernel-module-tpm-nsc \ kernel-module-tpm-nsc \
meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb
+2 -2
View File
@@ -7,8 +7,8 @@ inherit packagegroup
PACKAGES = "${PN}" PACKAGES = "${PN}"
SUMMARY_packagegroup-security-tpm2 = "Security TPM 2.0 support" SUMMARY:packagegroup-security-tpm2 = "Security TPM 2.0 support"
RDEPENDS_packagegroup-security-tpm2 = " \ RDEPENDS:packagegroup-security-tpm2 = " \
tpm2-tools \ tpm2-tools \
trousers \ trousers \
tpm2-tss \ tpm2-tss \
meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb
+2 -2
View File
@@ -7,8 +7,8 @@ inherit packagegroup
PACKAGES = "packagegroup-security-vtpm" PACKAGES = "packagegroup-security-vtpm"
SUMMARY_packagegroup-security-vtpm = "Security Software vTPM support" SUMMARY:packagegroup-security-vtpm = "Security Software vTPM support"
RDEPENDS_packagegroup-security-vtpm = " \ RDEPENDS:packagegroup-security-vtpm = " \
libtpm \ libtpm \
swtpm \ swtpm \
" "
meta-tpm/recipes-kernel/linux/linux-yocto_tpm.inc
+3 -3
View File
@@ -1,12 +1,12 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:" FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto:"
# Enable tpm in kernel # Enable tpm in kernel
SRC_URI_append_x86 = " \ SRC_URI:append:x86 = " \
${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.scc', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.scc', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'file://tpm2.scc', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'file://tpm2.scc', '', d)} \
" "
SRC_URI_append_x86-64 = " \ SRC_URI:append:x86-64 = " \
${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.scc', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.scc', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'file://tpm2.scc', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'file://tpm2.scc', '', d)} \
" "
meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb
+8 -8
View File
@@ -35,31 +35,31 @@ inherit autotools-brokensep pkgconfig
srk_dec_pw ?= "\\"\\\x1\\"\\"nc\\"\\"\\\x3\\"\\"nd\\"\\"\\\x1\\"\\"a\\"" srk_dec_pw ?= "\\"\\\x1\\"\\"nc\\"\\"\\\x3\\"\\"nd\\"\\"\\\x1\\"\\"a\\""
srk_dec_salt ?= "\\"r\\"\\"\\\x00\\\x00\\"\\"t\\"" srk_dec_salt ?= "\\"r\\"\\"\\\x00\\\x00\\"\\"t\\""
CFLAGS_append += "-DSRK_DEC_PW=${srk_dec_pw} -DSRK_DEC_SALT=${srk_dec_salt}" CFLAGS:append += "-DSRK_DEC_PW=${srk_dec_pw} -DSRK_DEC_SALT=${srk_dec_salt}"
# Uncomment below line if using the plain srk password for development # Uncomment below line if using the plain srk password for development
#CFLAGS_append += "-DTPM_SRK_PLAIN_PW" #CFLAGS_append += "-DTPM_SRK_PLAIN_PW"
do_configure_prepend() { do_configure:prepend() {
cd ${B} cd ${B}
cp LICENSE COPYING cp LICENSE COPYING
touch NEWS AUTHORS ChangeLog README touch NEWS AUTHORS ChangeLog README
} }
FILES_${PN}-staticdev += "${libdir}/ssl/engines-1.1/tpm.la" FILES:${PN}-staticdev += "${libdir}/ssl/engines-1.1/tpm.la"
FILES_${PN}-dbg += "\ FILES:${PN}-dbg += "\
${libdir}/ssl/engines-1.1/.debug \ ${libdir}/ssl/engines-1.1/.debug \
${libdir}/engines-1.1/.debug \ ${libdir}/engines-1.1/.debug \
${prefix}/local/ssl/lib/engines-1.1/.debug \ ${prefix}/local/ssl/lib/engines-1.1/.debug \
" "
FILES_${PN} += "\ FILES:${PN} += "\
${libdir}/ssl/engines-1.1/tpm.so* \ ${libdir}/ssl/engines-1.1/tpm.so* \
${libdir}/engines-1.1/tpm.so* \ ${libdir}/engines-1.1/tpm.so* \
${libdir}/libtpm.so* \ ${libdir}/libtpm.so* \
${prefix}/local/ssl/lib/engines-1.1/tpm.so* \ ${prefix}/local/ssl/lib/engines-1.1/tpm.so* \
" "
RDEPENDS_${PN} += "libcrypto libtspi" RDEPENDS:${PN} += "libcrypto libtspi"
INSANE_SKIP_${PN} = "libdir" INSANE_SKIP:${PN} = "libdir"
INSANE_SKIP_${PN}-dbg = "libdir" INSANE_SKIP:${PN}-dbg = "libdir"
meta-tpm/recipes-tpm/swtpm/swtpm_0.5.2.bb
+7 -7
View File
@@ -7,7 +7,7 @@ DEPENDS = "libtasn1 coreutils-native expect socat glib-2.0 net-tools-native libt
# 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_append = " tpm-tools-native expect-native socat-native python3-pip-native python3-cryptography-native" DEPENDS:append = " tpm-tools-native expect-native socat-native python3-pip-native python3-cryptography-native"
SRCREV = "e59c0c1a7b4c8d652dbb280fd6126895a7057464" SRCREV = "e59c0c1a7b4c8d652dbb280fd6126895a7057464"
SRC_URI = "git://github.com/stefanberger/swtpm.git;branch=stable-0.5 \ SRC_URI = "git://github.com/stefanberger/swtpm.git;branch=stable-0.5 \
@@ -36,19 +36,19 @@ PACKAGECONFIG[seccomp] = "--with-seccomp, --without-seccomp, libseccomp"
EXTRA_OECONF += "--with-tss-user=${TSS_USER} --with-tss-group=${TSS_GROUP}" EXTRA_OECONF += "--with-tss-user=${TSS_USER} --with-tss-group=${TSS_GROUP}"
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}"
PACKAGES =+ "${PN}-python" PACKAGES =+ "${PN}-python"
FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
PACKAGE_BEFORE_PN = "${PN}-cuse" PACKAGE_BEFORE_PN = "${PN}-cuse"
FILES_${PN}-cuse = "${bindir}/swtpm_cuse" FILES:${PN}-cuse = "${bindir}/swtpm_cuse"
INSANE_SKIP_${PN} += "dev-so" INSANE_SKIP:${PN} += "dev-so"
RDEPENDS_${PN} = "libtpm expect socat bash tpm-tools python3 python3-cryptography python3-twisted" RDEPENDS:${PN} = "libtpm expect socat bash tpm-tools python3 python3-cryptography python3-twisted"
BBCLASSEXTEND = "native nativesdk" BBCLASSEXTEND = "native nativesdk"
meta-tpm/recipes-tpm/tpm-tools/tpm-tools_1.3.9.2.bb
+2 -2
View File
@@ -10,7 +10,7 @@ LICENSE = "CPL-1.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=059e8cd6165cb4c31e351f2b69388fd9" LIC_FILES_CHKSUM = "file://LICENSE;md5=059e8cd6165cb4c31e351f2b69388fd9"
DEPENDS = "libtspi openssl perl" DEPENDS = "libtspi openssl perl"
DEPENDS_class-native = "trousers-native" DEPENDS:class-native = "trousers-native"
SRCREV = "bf43837575c5f7d31865562dce7778eae970052e" SRCREV = "bf43837575c5f7d31865562dce7778eae970052e"
SRC_URI = " \ SRC_URI = " \
@@ -24,7 +24,7 @@ inherit autotools-brokensep gettext
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
do_configure_prepend () { do_configure:prepend () {
mkdir -p po mkdir -p po
mkdir -p m4 mkdir -p m4
cp -R po_/* po/ cp -R po_/* po/
meta-tpm/recipes-tpm/trousers/trousers_git.bb
+16 -16
View File
@@ -30,7 +30,7 @@ do_install () {
oe_runmake DESTDIR=${D} install oe_runmake DESTDIR=${D} install
} }
do_install_append() { do_install:append() {
install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/trousers.init.sh ${D}${sysconfdir}/init.d/trousers install -m 0755 ${WORKDIR}/trousers.init.sh ${D}${sysconfdir}/init.d/trousers
install -d ${D}${sysconfdir}/udev/rules.d install -d ${D}${sysconfdir}/udev/rules.d
@@ -43,7 +43,7 @@ do_install_append() {
fi fi
} }
CONFFILES_${PN} += "${sysconfig}/tcsd.conf" CONFFILES:${PN} += "${sysconfig}/tcsd.conf"
PROVIDES = "${PACKAGES}" PROVIDES = "${PACKAGES}"
PACKAGES = " \ PACKAGES = " \
@@ -59,39 +59,39 @@ PACKAGES = " \
# libtspi needs tcsd for most (all?) operations, so suggest to # libtspi needs tcsd for most (all?) operations, so suggest to
# install that. # install that.
RRECOMMENDS_libtspi = "${PN}" RRECOMMENDS:libtspi = "${PN}"
FILES_libtspi = " \ FILES:libtspi = " \
${libdir}/*.so.1 \ ${libdir}/*.so.1 \
${libdir}/*.so.1.2.0 \ ${libdir}/*.so.1.2.0 \
" "
FILES_libtspi-dbg = " \ FILES:libtspi-dbg = " \
${libdir}/.debug \ ${libdir}/.debug \
${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/tspi \ ${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/tspi \
${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/trspi \ ${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/trspi \
${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/include/*.h \ ${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/include/*.h \
${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/include/tss \ ${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/include/tss \
" "
FILES_libtspi-dev = " \ FILES:libtspi-dev = " \
${includedir} \ ${includedir} \
${libdir}/*.so \ ${libdir}/*.so \
" "
FILES_libtspi-doc = " \ FILES:libtspi-doc = " \
${mandir}/man3 \ ${mandir}/man3 \
" "
FILES_libtspi-staticdev = " \ FILES:libtspi-staticdev = " \
${libdir}/*.la \ ${libdir}/*.la \
${libdir}/*.a \ ${libdir}/*.a \
" "
FILES_${PN} = " \ FILES:${PN} = " \
${sbindir}/tcsd \ ${sbindir}/tcsd \
${sysconfdir} \ ${sysconfdir} \
${localstatedir} \ ${localstatedir} \
" "
FILES_${PN}-dev += "${libdir}/trousers" FILES:${PN}-dev += "${libdir}/trousers"
FILES_${PN}-dbg = " \ FILES:${PN}-dbg = " \
${sbindir}/.debug \ ${sbindir}/.debug \
${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/tcs \ ${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/tcs \
${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/tcsd \ ${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/tcsd \
@@ -99,22 +99,22 @@ FILES_${PN}-dbg = " \
${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/trousers \ ${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/trousers \
${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/include/trousers \ ${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/include/trousers \
" "
FILES_${PN}-doc = " \ FILES:${PN}-doc = " \
${mandir}/man5 \ ${mandir}/man5 \
${mandir}/man8 \ ${mandir}/man8 \
" "
FILES_${PN} += "${systemd_unitdir}/*" FILES:${PN} += "${systemd_unitdir}/*"
INITSCRIPT_NAME = "trousers" INITSCRIPT_NAME = "trousers"
INITSCRIPT_PARAMS = "start 99 2 3 4 5 . stop 19 0 1 6 ." INITSCRIPT_PARAMS = "start 99 2 3 4 5 . stop 19 0 1 6 ."
USERADD_PACKAGES = "${PN}" USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "--system tss" GROUPADD_PARAM:${PN} = "--system tss"
USERADD_PARAM_${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" USERADD_PARAM:${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss"
SYSTEMD_PACKAGES = "${PN}" SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "tcsd.service" SYSTEMD_SERVICE:${PN} = "tcsd.service"
SYSTEMD_AUTO_ENABLE = "disable" SYSTEMD_AUTO_ENABLE = "disable"
BBCLASSEXTEND = "native" BBCLASSEXTEND = "native"
meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.4.0.bb
+7 -7
View File
@@ -25,20 +25,20 @@ S = "${WORKDIR}/git"
inherit autotools pkgconfig systemd update-rc.d useradd inherit autotools pkgconfig systemd update-rc.d useradd
SYSTEMD_PACKAGES += "${PN}" SYSTEMD_PACKAGES += "${PN}"
SYSTEMD_SERVICE_${PN} = "tpm2-abrmd.service" SYSTEMD_SERVICE:${PN} = "tpm2-abrmd.service"
SYSTEMD_AUTO_ENABLE_${PN} = "disable" SYSTEMD_AUTO_ENABLE:${PN} = "disable"
INITSCRIPT_NAME = "${PN}" INITSCRIPT_NAME = "${PN}"
INITSCRIPT_PARAMS = "start 99 2 3 4 5 . stop 19 0 1 6 ." INITSCRIPT_PARAMS = "start 99 2 3 4 5 . stop 19 0 1 6 ."
USERADD_PACKAGES = "${PN}" USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "tss" GROUPADD_PARAM:${PN} = "tss"
USERADD_PARAM_${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" USERADD_PARAM:${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss"
PACKAGECONFIG ?="${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', '', d)}" PACKAGECONFIG ?="${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', '', d)}"
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, --with-systemdsystemunitdir=no" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, --with-systemdsystemunitdir=no"
do_install_append() { do_install:append() {
install -d "${D}${sysconfdir}/init.d" install -d "${D}${sysconfdir}/init.d"
install -m 0755 "${WORKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd" install -m 0755 "${WORKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd"
@@ -46,9 +46,9 @@ do_install_append() {
install -m 0644 "${WORKDIR}/tpm2-abrmd.default" "${D}${sysconfdir}/default/tpm2-abrmd" install -m 0644 "${WORKDIR}/tpm2-abrmd.default" "${D}${sysconfdir}/default/tpm2-abrmd"
} }
FILES_${PN} += "${libdir}/systemd/system-preset \ FILES:${PN} += "${libdir}/systemd/system-preset \
${datadir}/dbus-1" ${datadir}/dbus-1"
RDEPENDS_${PN} += "tpm2-tss" RDEPENDS:${PN} += "tpm2-tss"
BBCLASSEXTEND = "native" BBCLASSEXTEND = "native"
meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.6.0.bb
+6 -6
View File
@@ -18,16 +18,16 @@ S = "${WORKDIR}/git"
inherit autotools-brokensep pkgconfig python3native inherit autotools-brokensep pkgconfig python3native
do_configure_prepend () { do_configure:prepend () {
${S}/bootstrap ${S}/bootstrap
} }
do_compile_append() { do_compile:append() {
cd ${S}/tools cd ${S}/tools
python3 setup.py build python3 setup.py build
} }
do_install_append() { do_install:append() {
install -d ${D}${libdir}/pkcs11 install -d ${D}${libdir}/pkcs11
install -d ${D}${datadir}/p11-kit install -d ${D}${datadir}/p11-kit
rm -f ${D}${libdir}/pkcs11/libtpm2_pkcs11.so rm -f ${D}${libdir}/pkcs11/libtpm2_pkcs11.so
@@ -41,15 +41,15 @@ do_install_append() {
PACKAGES =+ "${PN}-tools" PACKAGES =+ "${PN}-tools"
FILES_${PN}-tools = "\ FILES:${PN}-tools = "\
${bindir}/tpm2_ptool \ ${bindir}/tpm2_ptool \
${libdir}/${PYTHON_DIR}/* \ ${libdir}/${PYTHON_DIR}/* \
" "
FILES_${PN} += "\ FILES:${PN} += "\
${libdir}/pkcs11/* \ ${libdir}/pkcs11/* \
${datadir}/p11-kit/* \ ${datadir}/p11-kit/* \
" "
RDEPNDS_${PN} = "tpm2-tools" RDEPNDS_${PN} = "tpm2-tools"
RDEPENDS_${PN}-tools += "${PYTHON_PN}-setuptools ${PYTHON_PN}-pyyaml ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1-modules" RDEPENDS:${PN}-tools += "${PYTHON_PN}-setuptools ${PYTHON_PN}-pyyaml ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1-modules"
meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb
+8 -8
View File
@@ -18,28 +18,28 @@ inherit autotools pkgconfig
EFIDIR ?= "/EFI/BOOT" EFIDIR ?= "/EFI/BOOT"
EFI_ARCH_x86 = "ia32" EFI_ARCH:x86 = "ia32"
EFI_ARCH_x86-64 = "x86_64" EFI_ARCH:x86-64 = "x86_64"
CFLAGS_append = " -I${STAGING_INCDIR}/efi -I${STAGING_INCDIR}/efi/${EFI_ARCH}" CFLAGS:append = " -I${STAGING_INCDIR}/efi -I${STAGING_INCDIR}/efi/${EFI_ARCH}"
EXTRA_OECONF_append = " \ EXTRA_OECONF:append = " \
--with-efi-includedir=${STAGING_INCDIR} \ --with-efi-includedir=${STAGING_INCDIR} \
--with-efi-crt0=${STAGING_LIBDIR}/crt0-efi-${EFI_ARCH}.o \ --with-efi-crt0=${STAGING_LIBDIR}/crt0-efi-${EFI_ARCH}.o \
--with-efi-lds=${STAGING_LIBDIR}/elf_${EFI_ARCH}_efi.lds \ --with-efi-lds=${STAGING_LIBDIR}/elf_${EFI_ARCH}_efi.lds \
" "
do_compile_append() { do_compile:append() {
oe_runmake example oe_runmake example
} }
do_install_append() { do_install:append() {
install -d "${D}${EFIDIR}" install -d "${D}${EFIDIR}"
install -m 0755 "${B}"/example/*.efi "${D}${EFIDIR}" install -m 0755 "${B}"/example/*.efi "${D}${EFIDIR}"
} }
COMPATIBLE_HOST = "(i.86|x86_64).*-linux" COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
FILES_${PN} += "${EFIDIR}" FILES:${PN} += "${EFIDIR}"
RDEPENDS_${PN} = "gnu-efi libtss2-mu" RDEPENDS:${PN} = "gnu-efi libtss2-mu"
meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb
+4 -4
View File
@@ -17,7 +17,7 @@ S = "${WORKDIR}/git"
PACKAGES += "${PN}-engines ${PN}-engines-staticdev ${PN}-bash-completion" PACKAGES += "${PN}-engines ${PN}-engines-staticdev ${PN}-bash-completion"
FILES_${PN}-dev = "${libdir}/engines-1.1/tpm2tss.so ${includedir}/*" FILES:${PN}-dev = "${libdir}/engines-1.1/tpm2tss.so ${includedir}/*"
FILES_${PN}-engines = "${libdir}/engines-1.1/lib*.so*" FILES:${PN}-engines = "${libdir}/engines-1.1/lib*.so*"
FILES_${PN}-engines-staticdev = "${libdir}/engines-1.1/libtpm2tss.a" FILES:${PN}-engines-staticdev = "${libdir}/engines-1.1/libtpm2tss.a"
FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions" FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions"
meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.0.3.bb
+15 -15
View File
@@ -18,7 +18,7 @@ PACKAGECONFIG[oxygen] = ",--disable-doxygen-doc, "
PACKAGECONFIG[fapi] = "--enable-fapi,--disable-fapi,json-c " PACKAGECONFIG[fapi] = "--enable-fapi,--disable-fapi,json-c "
EXTRA_OECONF += "--enable-static --with-udevrulesdir=${nonarch_base_libdir}/udev/rules.d/" EXTRA_OECONF += "--enable-static --with-udevrulesdir=${nonarch_base_libdir}/udev/rules.d/"
EXTRA_OECONF_remove = " --disable-static" EXTRA_OECONF:remove = " --disable-static"
EXTRA_USERS_PARAMS = "\ EXTRA_USERS_PARAMS = "\
@@ -45,34 +45,34 @@ PACKAGES = " \
libtss2-staticdev \ libtss2-staticdev \
" "
FILES_libtss2-tcti-device = "${libdir}/libtss2-tcti-device.so.*" FILES:libtss2-tcti-device = "${libdir}/libtss2-tcti-device.so.*"
FILES_libtss2-tcti-device-dev = " \ FILES:libtss2-tcti-device-dev = " \
${includedir}/tss2/tss2_tcti_device.h \ ${includedir}/tss2/tss2_tcti_device.h \
${libdir}/pkgconfig/tss2-tcti-device.pc \ ${libdir}/pkgconfig/tss2-tcti-device.pc \
${libdir}/libtss2-tcti-device.so" ${libdir}/libtss2-tcti-device.so"
FILES_libtss2-tcti-device-staticdev = "${libdir}/libtss2-tcti-device.*a" FILES:libtss2-tcti-device-staticdev = "${libdir}/libtss2-tcti-device.*a"
FILES_libtss2-tcti-mssim = "${libdir}/libtss2-tcti-mssim.so.*" FILES:libtss2-tcti-mssim = "${libdir}/libtss2-tcti-mssim.so.*"
FILES_libtss2-tcti-mssim-dev = " \ FILES:libtss2-tcti-mssim-dev = " \
${includedir}/tss2/tss2_tcti_mssim.h \ ${includedir}/tss2/tss2_tcti_mssim.h \
${libdir}/pkgconfig/tss2-tcti-mssim.pc \ ${libdir}/pkgconfig/tss2-tcti-mssim.pc \
${libdir}/libtss2-tcti-mssim.so" ${libdir}/libtss2-tcti-mssim.so"
FILES_libtss2-tcti-mssim-staticdev = "${libdir}/libtss2-tcti-mssim.*a" FILES:libtss2-tcti-mssim-staticdev = "${libdir}/libtss2-tcti-mssim.*a"
FILES_libtss2-mu = "${libdir}/libtss2-mu.so.*" FILES:libtss2-mu = "${libdir}/libtss2-mu.so.*"
FILES_libtss2-mu-dev = " \ FILES:libtss2-mu-dev = " \
${includedir}/tss2/tss2_mu.h \ ${includedir}/tss2/tss2_mu.h \
${libdir}/pkgconfig/tss2-mu.pc \ ${libdir}/pkgconfig/tss2-mu.pc \
${libdir}/libtss2-mu.so" ${libdir}/libtss2-mu.so"
FILES_libtss2-mu-staticdev = "${libdir}/libtss2-mu.*a" FILES:libtss2-mu-staticdev = "${libdir}/libtss2-mu.*a"
FILES_libtss2 = "${libdir}/libtss2*so.*" FILES:libtss2 = "${libdir}/libtss2*so.*"
FILES_libtss2-dev = " \ FILES:libtss2-dev = " \
${includedir} \ ${includedir} \
${libdir}/pkgconfig \ ${libdir}/pkgconfig \
${libdir}/libtss2*so" ${libdir}/libtss2*so"
FILES_libtss2-staticdev = "${libdir}/libtss*a" FILES:libtss2-staticdev = "${libdir}/libtss*a"
FILES_${PN} = "${libdir}/udev ${nonarch_base_libdir}/udev" FILES:${PN} = "${libdir}/udev ${nonarch_base_libdir}/udev"
RDEPENDS_libtss2 = "libgcrypt" RDEPENDS:libtss2 = "libgcrypt"