summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2018-08-01 19:15:32 -0400
committerJia Zhang <zhang.jia@linux.alibaba.com>2018-08-03 10:49:00 +0800
commitc2e3fe9168218cbb353494a8c9a7568d580a7c56 (patch)
tree2815bf8a61811310dec29e75a9b9904db2598bd2
parentdc173c7a8dff4ac28ea0b075baa664aee5b92e6b (diff)
downloadmeta-secure-core-c2e3fe9168218cbb353494a8c9a7568d580a7c56.tar.gz
tpm2: move configure option
The --with-udevrulesdir configure option has been moved from tpm2-abrmd to tpm2-tss in the code, therefore move its associated EXTRA_OECONF to suit. Signed-off-by: Trevor Woerner <twoerner@gmail.com>
-rw-r--r--meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc1
-rw-r--r--meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc4
2 files changed, 4 insertions, 1 deletions
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc
index 804ee19..1cf5379 100644
--- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc
+++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc
@@ -33,7 +33,6 @@ USERADD_PARAM_${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss"
33EXTRA_OECONF += "\ 33EXTRA_OECONF += "\
34 --with-systemdsystemunitdir=${systemd_system_unitdir} \ 34 --with-systemdsystemunitdir=${systemd_system_unitdir} \
35 --with-systemdpresetdir=${systemd_unitdir}/system-preset \ 35 --with-systemdpresetdir=${systemd_unitdir}/system-preset \
36 --with-udevrulesdir=${sysconfdir}/udev/rules.d \
37" 36"
38 37
39do_install_append() { 38do_install_append() {
diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc
index b03c152..e917b87 100644
--- a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc
+++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss.inc
@@ -14,6 +14,10 @@ PROVIDES = "${PACKAGES}"
14 14
15inherit autotools pkgconfig 15inherit autotools pkgconfig
16 16
17EXTRA_OECONF += " \
18 --with-udevrulesdir=${sysconfdir}/udev/rules.d \
19"
20
17PACKAGES = " \ 21PACKAGES = " \
18 libtss2-mu \ 22 libtss2-mu \
19 libtss2-mu-dev \ 23 libtss2-mu-dev \