Commit 35e54647 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

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



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

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I10cee6aea941593b828a6a171297d7e997d0f30c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3868


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 30116833

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ bdev explicitly. It can be used only if auto_examine is disabled. 


Updated DPDK submodule to DPDK 20.08.



### intel-ipsec-mb



Updated intel-ipsec-mb submodule to v0.54



### isa-l



Updated ISA-L submodule to v2.29.0.

configure

+4 −4
Original line number Diff line number Diff line
@@ -163,14 +163,14 @@ fi 
#check nasm only on x86

if [[ $arch == x86_64* ]]; then

	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

		# ISA-L, compression & crypto require NASM version 2.13.03 or newer.

	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.14 or newer.

		CONFIG[ISAL]=n

		CONFIG[CRYPTO]=n

		CONFIG[IPSEC_MB]=n

		CONFIG[REDUCE]=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

		HAVE_NASM=y

	fi
@@ -649,7 +649,7 @@ fi 


if [[ "${CONFIG[ISAL]}" = "y" ]] || [[ "${CONFIG[CRYPTO]}" = "y" ]]; 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."

		exit 1

	else

intel-ipsec-mb @ 93c2ddf8

Compare 997d5536 to 93c2ddf8
Original line number Diff line number Diff line 
Subproject commit 997d553615b5b75b309093b359d8710d8d2f11c8
 
Subproject commit 93c2ddf877532f499a79e7111c9d9532cb44ceaf

scripts/pkgdep/debian.sh

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ apt-get install -y python3-configshell-fb python3-pexpect || echo \ 


# Additional dependencies for DPDK

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"

else

	apt-get install -y nasm