diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /meta-security/meta-tpm/recipes-tpm | |
parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-security/meta-tpm/recipes-tpm')
4 files changed, 33 insertions, 33 deletions
diff --git a/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb b/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb index 0f98b79f2..9ad8967f5 100644 --- a/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb +++ b/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb @@ -35,31 +35,31 @@ inherit autotools-brokensep pkgconfig srk_dec_pw ?= "\\"\\\x1\\"\\"nc\\"\\"\\\x3\\"\\"nd\\"\\"\\\x1\\"\\"a\\"" 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 #CFLAGS_append += "-DTPM_SRK_PLAIN_PW" -do_configure_prepend() { +do_configure:prepend() { cd ${B} cp LICENSE COPYING touch NEWS AUTHORS ChangeLog README } -FILES_${PN}-staticdev += "${libdir}/ssl/engines-1.1/tpm.la" -FILES_${PN}-dbg += "\ +FILES:${PN}-staticdev += "${libdir}/ssl/engines-1.1/tpm.la" +FILES:${PN}-dbg += "\ ${libdir}/ssl/engines-1.1/.debug \ ${libdir}/engines-1.1/.debug \ ${prefix}/local/ssl/lib/engines-1.1/.debug \ " -FILES_${PN} += "\ +FILES:${PN} += "\ ${libdir}/ssl/engines-1.1/tpm.so* \ ${libdir}/engines-1.1/tpm.so* \ ${libdir}/libtpm.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}-dbg = "libdir" +INSANE_SKIP:${PN} = "libdir" +INSANE_SKIP:${PN}-dbg = "libdir" diff --git a/meta-security/meta-tpm/recipes-tpm/swtpm/swtpm_0.5.2.bb b/meta-security/meta-tpm/recipes-tpm/swtpm/swtpm_0.5.2.bb index caf99e823..912e939a1 100644 --- a/meta-security/meta-tpm/recipes-tpm/swtpm/swtpm_0.5.2.bb +++ b/meta-security/meta-tpm/recipes-tpm/swtpm/swtpm_0.5.2.bb @@ -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 # 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" 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}" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system ${TSS_USER}" -USERADD_PARAM_${PN} = "--system -g ${TSS_GROUP} --home-dir \ +GROUPADD_PARAM:${PN} = "--system ${TSS_USER}" +USERADD_PARAM:${PN} = "--system -g ${TSS_GROUP} --home-dir \ --no-create-home --shell /bin/false ${BPN}" PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" 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" diff --git a/meta-security/meta-tpm/recipes-tpm/tpm-tools/tpm-tools_1.3.9.2.bb b/meta-security/meta-tpm/recipes-tpm/tpm-tools/tpm-tools_1.3.9.2.bb index 9e0a6862b..dbe1647d2 100644 --- a/meta-security/meta-tpm/recipes-tpm/tpm-tools/tpm-tools_1.3.9.2.bb +++ b/meta-security/meta-tpm/recipes-tpm/tpm-tools/tpm-tools_1.3.9.2.bb @@ -10,7 +10,7 @@ LICENSE = "CPL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=059e8cd6165cb4c31e351f2b69388fd9" DEPENDS = "libtspi openssl perl" -DEPENDS_class-native = "trousers-native" +DEPENDS:class-native = "trousers-native" SRCREV = "bf43837575c5f7d31865562dce7778eae970052e" SRC_URI = " \ @@ -24,7 +24,7 @@ inherit autotools-brokensep gettext S = "${WORKDIR}/git" -do_configure_prepend () { +do_configure:prepend () { mkdir -p po mkdir -p m4 cp -R po_/* po/ diff --git a/meta-security/meta-tpm/recipes-tpm/trousers/trousers_git.bb b/meta-security/meta-tpm/recipes-tpm/trousers/trousers_git.bb index 32c9a4976..a746103de 100644 --- a/meta-security/meta-tpm/recipes-tpm/trousers/trousers_git.bb +++ b/meta-security/meta-tpm/recipes-tpm/trousers/trousers_git.bb @@ -30,7 +30,7 @@ do_install () { oe_runmake DESTDIR=${D} install } -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/trousers.init.sh ${D}${sysconfdir}/init.d/trousers install -d ${D}${sysconfdir}/udev/rules.d @@ -43,7 +43,7 @@ do_install_append() { fi } -CONFFILES_${PN} += "${sysconfig}/tcsd.conf" +CONFFILES:${PN} += "${sysconfig}/tcsd.conf" PROVIDES = "${PACKAGES}" PACKAGES = " \ @@ -59,39 +59,39 @@ PACKAGES = " \ # libtspi needs tcsd for most (all?) operations, so suggest to # install that. -RRECOMMENDS_libtspi = "${PN}" +RRECOMMENDS:libtspi = "${PN}" -FILES_libtspi = " \ +FILES:libtspi = " \ ${libdir}/*.so.1 \ ${libdir}/*.so.1.2.0 \ " -FILES_libtspi-dbg = " \ +FILES:libtspi-dbg = " \ ${libdir}/.debug \ ${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/include/*.h \ ${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/include/tss \ " -FILES_libtspi-dev = " \ +FILES:libtspi-dev = " \ ${includedir} \ ${libdir}/*.so \ " -FILES_libtspi-doc = " \ +FILES:libtspi-doc = " \ ${mandir}/man3 \ " -FILES_libtspi-staticdev = " \ +FILES:libtspi-staticdev = " \ ${libdir}/*.la \ ${libdir}/*.a \ " -FILES_${PN} = " \ +FILES:${PN} = " \ ${sbindir}/tcsd \ ${sysconfdir} \ ${localstatedir} \ " -FILES_${PN}-dev += "${libdir}/trousers" +FILES:${PN}-dev += "${libdir}/trousers" -FILES_${PN}-dbg = " \ +FILES:${PN}-dbg = " \ ${sbindir}/.debug \ ${prefix}/src/debug/${PN}/${PV}-${PR}/git/src/tcs \ ${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/include/trousers \ " -FILES_${PN}-doc = " \ +FILES:${PN}-doc = " \ ${mandir}/man5 \ ${mandir}/man8 \ " -FILES_${PN} += "${systemd_unitdir}/*" +FILES:${PN} += "${systemd_unitdir}/*" INITSCRIPT_NAME = "trousers" INITSCRIPT_PARAMS = "start 99 2 3 4 5 . stop 19 0 1 6 ." USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system tss" -USERADD_PARAM_${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" +GROUPADD_PARAM:${PN} = "--system tss" +USERADD_PARAM:${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "tcsd.service" +SYSTEMD_SERVICE:${PN} = "tcsd.service" SYSTEMD_AUTO_ENABLE = "disable" BBCLASSEXTEND = "native" |