diff options
author | Mingli Yu <Mingli.Yu@windriver.com> | 2019-07-23 14:37:59 +0800 |
---|---|---|
committer | Jia Zhang <zhang.jia@linux.alibaba.com> | 2019-07-23 17:59:57 +0800 |
commit | 075c5e687eb9a8bb4564891a3bc83879c4365d4a (patch) | |
tree | 8cf318847ed524f4bfdb9b84d5ee8e0f7786ecbb | |
parent | 392371e4b0e9edd51d3b86edc988e543874be5ed (diff) | |
download | meta-secure-core-075c5e687eb9a8bb4564891a3bc83879c4365d4a.tar.gz |
tpm2-tss: fix do_compile error
After commit [5ef547b autoconf-archive: update to 2019.01.06]
applied in oe-core, there comes below error
when build tpm2-tss:
| NOTE: make -j 48
| Makefile:14636: *** missing separator. Stop.
So backport a patch from tpm2-tss upstream to fix
this failure.
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
-rw-r--r-- | meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch | 49 | ||||
-rw-r--r-- | meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb | 5 |
2 files changed, 53 insertions, 1 deletions
diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch new file mode 100644 index 0000000..56f9d4b --- /dev/null +++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss/0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 91d71fb0b7316dedc18ab003954b2358008d8cde Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonas Witschel <diabonas@gmx.de> | ||
3 | Date: Mon, 7 Jan 2019 22:15:06 +0100 | ||
4 | Subject: [PATCH] build: update for ax_code_coverage.m4 version 2019.01.06 | ||
5 | |||
6 | @CODE_COVERAGE_RULES@ doesn't exist any more and needs to be replaced. | ||
7 | Also includes a compatibility switch for older versions of the file. | ||
8 | |||
9 | Upstream-Status: Backport [https://github.com/tpm2-software/tpm2-tss/commit/648fa841fa2f2bb6f8fdda02c36ac0abb45f5329] | ||
10 | |||
11 | Signed-off-by: Jonas Witschel <diabonas@gmx.de> | ||
12 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | ||
13 | --- | ||
14 | Makefile.am | 6 ++++++ | ||
15 | configure.ac | 3 +++ | ||
16 | 2 files changed, 9 insertions(+) | ||
17 | |||
18 | diff --git a/Makefile.am b/Makefile.am | ||
19 | index d78d23f..7815c4b 100644 | ||
20 | --- a/Makefile.am | ||
21 | +++ b/Makefile.am | ||
22 | @@ -42,7 +42,13 @@ noinst_PROGRAMS = | ||
23 | |||
24 | ### Add ax_* rules ### | ||
25 | # ax_code_coverage | ||
26 | +if AUTOCONF_CODE_COVERAGE_2019_01_06 | ||
27 | +include $(top_srcdir)/aminclude_static.am | ||
28 | +clean-local: code-coverage-clean | ||
29 | +dist-clean-local: code-coverage-dist-clean | ||
30 | +else | ||
31 | @CODE_COVERAGE_RULES@ | ||
32 | +endif | ||
33 | |||
34 | # ax_doxygen | ||
35 | @DX_RULES@ | ||
36 | diff --git a/configure.ac b/configure.ac | ||
37 | index c8aa314..40883a8 100644 | ||
38 | --- a/configure.ac | ||
39 | +++ b/configure.ac | ||
40 | @@ -206,6 +206,9 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, [Doxyfile], [doc/doxygen]) | ||
41 | AM_CONDITIONAL(DOXYMAN, [test $DX_FLAG_man -eq 1]) | ||
42 | |||
43 | AX_CODE_COVERAGE | ||
44 | +m4_ifdef([_AX_CODE_COVERAGE_RULES], | ||
45 | + [AM_CONDITIONAL(AUTOCONF_CODE_COVERAGE_2019_01_06, [true])], | ||
46 | + [AM_CONDITIONAL(AUTOCONF_CODE_COVERAGE_2019_01_06, [false])]) | ||
47 | |||
48 | AC_OUTPUT | ||
49 | |||
diff --git a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb index 9fe3d6c..9cc0247 100644 --- a/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb +++ b/meta-tpm2/recipes-tpm/tpm2-tss/tpm2-tss_2.0.0.bb | |||
@@ -1,6 +1,9 @@ | |||
1 | include ${BPN}.inc | 1 | include ${BPN}.inc |
2 | 2 | ||
3 | SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz" | 3 | SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ |
4 | file://0001-build-update-for-ax_code_coverage.m4-version-2019.01.patch \ | ||
5 | " | ||
6 | |||
4 | SRC_URI[md5sum] = "048ea77be36f881b7b6ecefbc1cf7dbd" | 7 | SRC_URI[md5sum] = "048ea77be36f881b7b6ecefbc1cf7dbd" |
5 | SRC_URI[sha256sum] = "7dfd05f7d2c4d5339d1c9ecbdba25f4ea6df70e96b09928e15e0560cce02d525" | 8 | SRC_URI[sha256sum] = "7dfd05f7d2c4d5339d1c9ecbdba25f4ea6df70e96b09928e15e0560cce02d525" |
6 | 9 | ||