summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2020-01-19 11:02:51 +0800
committerJia Zhang <zhang.jia@linux.alibaba.com>2020-01-19 11:52:46 +0800
commit8302e3c479154157667e22e9d7c5461c966b4586 (patch)
tree8432f37916291f1ff9f048a796e605241390b5e3
parent84ee95f92a32095bbf2308af235fa49817f9898b (diff)
downloadmeta-secure-core-8302e3c479154157667e22e9d7c5461c966b4586.tar.gz
ima-inspect: upgrade 0.11 -> 0.13
Fixes: * Use glibc header instead of libattr header because the attr/xattr.h has been removed from attr package. * fix configure check for newer libimaevm versions. Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
-rw-r--r--meta-integrity/recipes-support/ima-inspect/ima-inspect/fix-new-imaevm.patch13
-rw-r--r--meta-integrity/recipes-support/ima-inspect/ima-inspect_0.13.bb (renamed from meta-integrity/recipes-support/ima-inspect/ima-inspect_0.11.bb)3
2 files changed, 1 insertions, 15 deletions
diff --git a/meta-integrity/recipes-support/ima-inspect/ima-inspect/fix-new-imaevm.patch b/meta-integrity/recipes-support/ima-inspect/ima-inspect/fix-new-imaevm.patch
deleted file mode 100644
index 6ba0fcd..0000000
--- a/meta-integrity/recipes-support/ima-inspect/ima-inspect/fix-new-imaevm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: git/configure.ac
2===================================================================
3--- git.orig/configure.ac
4+++ git/configure.ac
5@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([foreign subdir-objects
6 AC_CONFIG_FILES([Makefile])
7
8 PKG_CHECK_MODULES([TCLAP], [tclap])
9-AC_SEARCH_LIBS([do_dump], [imaevm], [], [
10+AC_SEARCH_LIBS([imaevm_do_hexdump], [imaevm], [], [
11 AC_MSG_ERROR([unable to find libimaevm, you need ima-evm-utils-devel or similar package])
12 ])
13
diff --git a/meta-integrity/recipes-support/ima-inspect/ima-inspect_0.11.bb b/meta-integrity/recipes-support/ima-inspect/ima-inspect_0.13.bb
index 09cbe15..c5ee628 100644
--- a/meta-integrity/recipes-support/ima-inspect/ima-inspect_0.11.bb
+++ b/meta-integrity/recipes-support/ima-inspect/ima-inspect_0.13.bb
@@ -5,9 +5,8 @@ DEPENDS += "attr ima-evm-utils tclap"
5 5
6SRC_URI = " \ 6SRC_URI = " \
7 git://github.com/mgerstner/ima-inspect.git \ 7 git://github.com/mgerstner/ima-inspect.git \
8 file://fix-new-imaevm.patch \
9" 8"
10SRCREV = "e912be2d2a9fdf30a9693a7fc5d6b2473990a71c" 9SRCREV = "90f395c84eff54c69ba9ee078274313cfd308b53"
11 10
12S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
13 12