summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-tpm/recipes-core/systemd/systemd-boot_%.bbappend2
-rw-r--r--meta-tpm/recipes-tpm/swtpm/swtpm_0.10.0.bb4
-rw-r--r--meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta-tpm/recipes-core/systemd/systemd-boot_%.bbappend b/meta-tpm/recipes-core/systemd/systemd-boot_%.bbappend
index 712a764..55323aa 100644
--- a/meta-tpm/recipes-core/systemd/systemd-boot_%.bbappend
+++ b/meta-tpm/recipes-core/systemd/systemd-boot_%.bbappend
@@ -2,6 +2,6 @@ DEPENDS += "\
2 ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'tpm2-tss libtss2 libtss2-tcti-device', '', d)} \ 2 ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'tpm2-tss libtss2 libtss2-tcti-device', '', d)} \
3" 3"
4 4
5EXTRA_OEMESON:append= "\ 5EXTRA_OEMESON:append = "\
6 ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', '-Dtpm2=true', '', d)} \ 6 ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', '-Dtpm2=true', '', d)} \
7" 7"
diff --git a/meta-tpm/recipes-tpm/swtpm/swtpm_0.10.0.bb b/meta-tpm/recipes-tpm/swtpm/swtpm_0.10.0.bb
index 3e58c33..c7159e0 100644
--- a/meta-tpm/recipes-tpm/swtpm/swtpm_0.10.0.bb
+++ b/meta-tpm/recipes-tpm/swtpm/swtpm_0.10.0.bb
@@ -15,8 +15,8 @@ S = "${WORKDIR}/git"
15PARALLEL_MAKE = "" 15PARALLEL_MAKE = ""
16inherit autotools pkgconfig perlnative 16inherit autotools pkgconfig perlnative
17 17
18TSS_USER="tss" 18TSS_USER = "tss"
19TSS_GROUP="tss" 19TSS_GROUP = "tss"
20 20
21PACKAGECONFIG ?= "openssl gnutls" 21PACKAGECONFIG ?= "openssl gnutls"
22PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" 22PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"
diff --git a/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb b/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb
index 24fd5b5..1b8eff1 100644
--- a/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb
@@ -35,7 +35,7 @@ USERADD_PACKAGES = "${PN}"
35GROUPADD_PARAM:${PN} = "tss" 35GROUPADD_PARAM:${PN} = "tss"
36USERADD_PARAM:${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" 36USERADD_PARAM:${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss"
37 37
38PACKAGECONFIG ?="${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', '', d)}" 38PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', '', d)}"
39PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, --with-systemdsystemunitdir=no" 39PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, --with-systemdsystemunitdir=no"
40 40
41do_install:append() { 41do_install:append() {