d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

intel-ipsec-mb: update submodule to v0.54

Browse Source 
Updated required NASM version to 2.14,
since intel-ipsec-mb v0.54 now requires it.

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I10cee6aea941593b828a6a171297d7e997d0f30c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3868
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Tomasz Zawadzki 2020-08-20 08:07:46 -04:00
parent 30116833fa
commit 35e54647fb
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -11,6 +11,10 @@ bdev explicitly. It can be used only if auto_examine is disabled.
Updated DPDK submodule to DPDK 20.08. Updated DPDK submodule to DPDK 20.08.
### intel-ipsec-mb
Updated intel-ipsec-mb submodule to v0.54
### isa-l ### isa-l
Updated ISA-L submodule to v2.29.0. Updated ISA-L submodule to v2.29.0.

8
configure vendored
View File

@ -163,14 +163,14 @@ fi
#check nasm only on x86 #check nasm only on x86
if [[ $arch == x86_64* ]]; then if [[ $arch == x86_64* ]]; then
ver=$(nasm -v 2>/dev/null | awk '{print $3}' | sed 's/[^0-9]*//g') ver=$(nasm -v 2>/dev/null | awk '{print $3}' | sed 's/[^0-9]*//g')
if [[ "${ver:0:1}" -le "2" ]] && [[ "${ver:0:3}" -le "213" ]] && [[ "${ver:0:5}" -lt "21303" ]]; then if [[ "${ver:0:1}" -le "2" ]] && [[ "${ver:0:3}" -le "214" ]] && [[ "${ver:0:5}" -lt "21400" ]]; then
# ISA-L, compression & crypto require NASM version 2.13.03 or newer. # ISA-L, compression & crypto require NASM version 2.14 or newer.
CONFIG[ISAL]=n CONFIG[ISAL]=n
CONFIG[CRYPTO]=n CONFIG[CRYPTO]=n
CONFIG[IPSEC_MB]=n CONFIG[IPSEC_MB]=n
CONFIG[REDUCE]=n CONFIG[REDUCE]=n
HAVE_NASM=n HAVE_NASM=n
echo "Notice: ISA-L, compression & crypto require NASM version 2.13.03 or newer. Turning off default ISA-L and crypto features." echo "Notice: ISA-L, compression & crypto require NASM version 2.14 or newer. Turning off default ISA-L and crypto features."
else else
HAVE_NASM=y HAVE_NASM=y
fi fi
@ -649,7 +649,7 @@ fi
if [[ "${CONFIG[ISAL]}" = "y" ]] || [[ "${CONFIG[CRYPTO]}" = "y" ]]; then if [[ "${CONFIG[ISAL]}" = "y" ]] || [[ "${CONFIG[CRYPTO]}" = "y" ]]; then
if [[ "${HAVE_NASM}" = "n" ]] && [[ $arch == x86_64* ]]; then if [[ "${HAVE_NASM}" = "n" ]] && [[ $arch == x86_64* ]]; then
echo "ERROR: ISA-L, compression & crypto require NASM version 2.13.03 or newer." echo "ERROR: ISA-L, compression & crypto require NASM version 2.14 or newer."
echo "Please install or upgrade them re-run this script." echo "Please install or upgrade them re-run this script."
exit 1 exit 1
else else

2
intel-ipsec-mb

@ -1 +1 @@
Subproject commit 997d553615b5b75b309093b359d8710d8d2f11c8 Subproject commit 93c2ddf877532f499a79e7111c9d9532cb44ceaf

2
scripts/pkgdep/debian.sh
View File

@ -13,7 +13,7 @@ apt-get install -y python3-configshell-fb python3-pexpect || echo \
# Additional dependencies for DPDK # Additional dependencies for DPDK
if [[ $NAME == "Ubuntu" ]] && [[ $VERSION_ID_NUM -lt 1900 ]]; then if [[ $NAME == "Ubuntu" ]] && [[ $VERSION_ID_NUM -lt 1900 ]]; then
echo "Ubuntu $VERSION_ID needs NASM version 2.13.03 for DPDK but is not in the mainline repository." echo "Ubuntu $VERSION_ID needs NASM version 2.14 for DPDK but is not in the mainline repository."
echo "You can install it manually" echo "You can install it manually"
else else
apt-get install -y nasm apt-get install -y nasm