diff options
| -rw-r--r-- | meta-tpm/recipes-core/systemd/systemd-boot_%.bbappend | 2 | ||||
| -rw-r--r-- | meta-tpm/recipes-tpm/swtpm/swtpm_0.10.0.bb | 4 | ||||
| -rw-r--r-- | meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb | 2 |
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 | ||
| 5 | EXTRA_OEMESON:append= "\ | 5 | EXTRA_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" | |||
| 15 | PARALLEL_MAKE = "" | 15 | PARALLEL_MAKE = "" |
| 16 | inherit autotools pkgconfig perlnative | 16 | inherit autotools pkgconfig perlnative |
| 17 | 17 | ||
| 18 | TSS_USER="tss" | 18 | TSS_USER = "tss" |
| 19 | TSS_GROUP="tss" | 19 | TSS_GROUP = "tss" |
| 20 | 20 | ||
| 21 | PACKAGECONFIG ?= "openssl gnutls" | 21 | PACKAGECONFIG ?= "openssl gnutls" |
| 22 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" | 22 | PACKAGECONFIG += "${@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}" | |||
| 35 | GROUPADD_PARAM:${PN} = "tss" | 35 | GROUPADD_PARAM:${PN} = "tss" |
| 36 | USERADD_PARAM:${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" | 36 | USERADD_PARAM:${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" |
| 37 | 37 | ||
| 38 | PACKAGECONFIG ?="${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', '', d)}" | 38 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', '', d)}" |
| 39 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, --with-systemdsystemunitdir=no" | 39 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, --with-systemdsystemunitdir=no" |
| 40 | 40 | ||
| 41 | do_install:append() { | 41 | do_install:append() { |
