[PATCH] containers: update ACVP IPsec MB to v2.0

[Kai Ji]

Update Intel IPsec Multi-buffer v2.0
Update from make to cmake and refresh the shared library
cache after installation.

Signed-off-by: Kai Ji <kai.ji at intel.com>
---
 containers/template_engine/inventory.yaml            |  1 +
 .../containers/ubuntu_acvp_fips.dockerfile.j2        |  8 +++++---
 tools/acvp/README                                    | 12 +++++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/containers/template_engine/inventory.yaml b/containers/template_engine/inventory.yaml
index be7354e..59ba427 100644
--- a/containers/template_engine/inventory.yaml
+++ b/containers/template_engine/inventory.yaml
@@ -283,6 +283,7 @@ dockerfiles:
     ubuntu_acvp_fips:
       parent: "ubuntu20.04"
       packages:
+        - cmake
         - nasm
     ubuntu_sve:
       parent: "ubuntu20.04"
diff --git a/containers/template_engine/templates/containers/ubuntu_acvp_fips.dockerfile.j2 b/containers/template_engine/templates/containers/ubuntu_acvp_fips.dockerfile.j2
index e4d2078..df1eeea 100644
--- a/containers/template_engine/templates/containers/ubuntu_acvp_fips.dockerfile.j2
+++ b/containers/template_engine/templates/containers/ubuntu_acvp_fips.dockerfile.j2
@@ -9,9 +9,11 @@
 # Build and install the Intel ipsec multibuffer library
 RUN git clone "https://github.com/intel/intel-ipsec-mb.git" && \
     cd intel-ipsec-mb && \
-    git checkout v1.3 && \
-    make -j 4 && \
-    make install && \
+    git checkout v2.0 && \
+    cmake . && \
+    cmake --build . --parallel 4 && \
+    cmake --install . && \
+    ldconfig && \
     cd .. && \
     rm -rf intel-ipsec-mb
 
diff --git a/tools/acvp/README b/tools/acvp/README
index e89828a..7bd2275 100644
--- a/tools/acvp/README
+++ b/tools/acvp/README
@@ -19,7 +19,7 @@ There are also python packages you need to download from the requirements.txt fi
 * pyotp
 * requests
 
-Along with these, you will also need to install the `nasm` package using your local package manager.
+Along with these, you will also need to install the `cmake` and `nasm` packages using your local package manager.
 
 The tool expects that you have all the credential files from NIST:
 * Client certificate (usually a .cer file from NIST)
@@ -55,13 +55,15 @@ Now you can use the acvp_tool.py script to register a test session,
 upload the results, and download the verdict.
 
 In order to run the DPDK sample application, there are a few libraries which must be installed:
-* Intel IPSec Multi-buffer (v1.3)
+* Intel IPSec Multi-buffer (v2.0)
 ```
 git clone https://github.com/intel/intel-ipsec-mb.git
 cd intel-ipsec-mb
-git checkout v1.3
-make -j 4
-make install
+git checkout v2.0
+cmake .
+cmake --build . --parallel 4
+cmake --install .
+ldconfig
 ```
 * FIPS Object Module
 ```
-- 
2.34.1