diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-01-09 01:10:30 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2021-01-09 01:10:30 +0300 |
| commit | 015e6aa5df52e64da55eb64ea70ff1a58540d1f6 (patch) | |
| tree | f46e0c54feddcf3fcfe177c1e32d5a5862fd1b43 /meta-security | |
| parent | 15ad1111c1552b41e177e6f8129949b9d4bbb5f9 (diff) | |
| download | openbmc-015e6aa5df52e64da55eb64ea70ff1a58540d1f6.tar.xz | |
meta-security: subtree update:d2ceb5e438..6053e8b8e2
Adrian Ratiu (1):
tpm2-pkcs11: build and package python tools
Armin Kuster (1):
.gitlab-ci: drop script
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Id1d62df74a8739edf14669a8ad3a948de583fe1a
Diffstat (limited to 'meta-security')
| -rw-r--r-- | meta-security/.gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.4.0.bb | 25 |
2 files changed, 23 insertions, 3 deletions
diff --git a/meta-security/.gitlab-ci.yml b/meta-security/.gitlab-ci.yml index 3a1687cca6..1442239b20 100644 --- a/meta-security/.gitlab-ci.yml +++ b/meta-security/.gitlab-ci.yml @@ -19,7 +19,6 @@ stages: - done - cd $CI_PROJECT_DIR - rm -rf build - - $CI_PROJECT_DIR/scripts/ci-cleanup.sh cache: paths: - layers diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.4.0.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.4.0.bb index 4865733411..6beb67a183 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.4.0.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.4.0.bb @@ -4,7 +4,7 @@ SECTION = "security/tpm" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0fc19f620a102768d6dbd1e7166e78ab" -DEPENDS = "autoconf-archive pkgconfig dstat sqlite3 openssl libtss2-dev tpm2-tools libyaml" +DEPENDS = "autoconf-archive pkgconfig dstat sqlite3 openssl libtss2-dev tpm2-tools libyaml python3-setuptools-native" SRC_URI = "git://github.com/tpm2-software/tpm2-pkcs11.git;branch=1.X \ file://bootstrap_fixup.patch \ @@ -14,10 +14,31 @@ SRCREV = "78bbf6a0237351830d0c3923b25ba0b57ae0b7e9" S = "${WORKDIR}/git" -inherit autotools-brokensep pkgconfig +inherit autotools-brokensep pkgconfig python3native do_configure_prepend () { ${S}/bootstrap } +do_compile_append() { + cd ${S}/tools + python3 setup.py build +} + +do_install_append() { + cd ${S}/tools + export PYTHONPATH="${D}${PYTHON_SITEPACKAGES_DIR}" + ${PYTHON_PN} setup.py install --root="${D}" --prefix="${prefix}" --install-lib="${PYTHON_SITEPACKAGES_DIR}" --optimize=1 --skip-build + + sed -i -e "s:${PYTHON}:${USRBINPATH}/env ${PYTHON_PN}:g" "${D}${bindir}"/tpm2_ptool +} + RDEPNDS_${PN} = "tpm2-tools" + +PACKAGES =+ "${PN}-tools" +RDEPENDS_${PN}-tools += "${PYTHON_PN}-setuptools ${PYTHON_PN}-pyyaml ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1-modules" + +FILES_${PN}-tools = "\ + ${bindir}/tpm2_ptool \ + ${libdir}/${PYTHON_DIR}/* \ +" |