From ba4d6c891c580269e4390ba359264ea84f19d756 Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Mon, 20 Jun 2016 15:44:52 +0100 Subject: [PATCH] crypto/snow3g: rename libsso reference due to library update The underlying libsso library that SNOW3G PMD uses has been updated, so now it is called libsso_snow3g. Also, the path to the library has been renamed to reflect this changes (now called LIBSSO_SNOW3G_PATH). Signed-off-by: Pablo de Lara Acked-by: Deepak Kumar Jain --- doc/guides/cryptodevs/snow3g.rst | 6 +++--- drivers/crypto/snow3g/Makefile | 10 +++++----- mk/rte.app.mk | 2 +- scripts/test-build.sh | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst index c1098b1a8e..8564c9f739 100644 --- a/doc/guides/cryptodevs/snow3g.rst +++ b/doc/guides/cryptodevs/snow3g.rst @@ -58,7 +58,7 @@ Installation ------------ To build DPDK with the SNOW3G_PMD the user is required to download -the export controlled ``libsso`` library, by requesting it from +the export controlled ``libsso_snow3g`` library, by requesting it from ``_, and compiling it on their system before building DPDK:: @@ -96,10 +96,10 @@ Initialization In order to enable this virtual crypto PMD, user must: -* Export the environmental variable LIBSSO_PATH with the path where +* Export the environmental variable LIBSSO_SNOW3G_PATH with the path where the library was extracted. -* Build the LIBSSO library (explained in Installation section). +* Build the LIBSSO_SNOW3G library (explained in Installation section). * Set CONFIG_RTE_LIBRTE_PMD_SNOW3G=y in config/common_base. diff --git a/drivers/crypto/snow3g/Makefile b/drivers/crypto/snow3g/Makefile index 17b15ef205..fb64059757 100644 --- a/drivers/crypto/snow3g/Makefile +++ b/drivers/crypto/snow3g/Makefile @@ -31,8 +31,8 @@ include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(MAKECMDGOALS),clean) -ifeq ($(LIBSSO_PATH),) -$(error "Please define LIBSSO_PATH environment variable") +ifeq ($(LIBSSO_SNOW3G_PATH),) +$(error "Please define LIBSSO_SNOW3G_PATH environment variable") endif endif @@ -50,9 +50,9 @@ LIBABIVER := 1 EXPORT_MAP := rte_pmd_snow3g_version.map # external library include paths -CFLAGS += -I$(LIBSSO_PATH) -CFLAGS += -I$(LIBSSO_PATH)/include -CFLAGS += -I$(LIBSSO_PATH)/build +CFLAGS += -I$(LIBSSO_SNOW3G_PATH) +CFLAGS += -I$(LIBSSO_SNOW3G_PATH)/include +CFLAGS += -I$(LIBSSO_SNOW3G_PATH)/build # library source files SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd.c diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 632d65bf96..d96388fed9 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -134,7 +134,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -L$(AESNI_MULTI_BUFFER_LIB_PATH) _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += -lrte_pmd_null_crypto _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lrte_pmd_qat -lcrypto _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lrte_pmd_snow3g -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -L$(LIBSSO_PATH)/build -lsso +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -L$(LIBSSO_SNOW3G_PATH)/build -lsso_snow3g _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -lrte_pmd_kasumi _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -L$(LIBSSO_KASUMI_PATH)/build -lsso_kasumi endif # CONFIG_RTE_LIBRTE_CRYPTODEV diff --git a/scripts/test-build.sh b/scripts/test-build.sh index 0cfbdbc1ea..31d55834d4 100755 --- a/scripts/test-build.sh +++ b/scripts/test-build.sh @@ -45,7 +45,7 @@ default_path=$PATH # - DPDK_DEP_ZLIB (y/[n]) # - DPDK_MAKE_JOBS (int) # - DPDK_NOTIFY (notify-send) -# - LIBSSO_PATH +# - LIBSSO_SNOW3G_PATH # - LIBSSO_KASUMI_PATH . $(dirname $(readlink -e $0))/load-devel-config.sh @@ -122,7 +122,7 @@ reset_env () unset DPDK_DEP_SZE unset DPDK_DEP_ZLIB unset AESNI_MULTI_BUFFER_LIB_PATH - unset LIBSSO_PATH + unset LIBSSO_SNOW3G_PATH unset LIBSSO_KASUMI_PATH unset PQOS_INSTALL_PATH } @@ -168,7 +168,7 @@ config () # sed -ri 's,(PMD_AESNI_MB=)n,\1y,' $1/.config test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \ sed -ri 's,(PMD_AESNI_GCM=)n,\1y,' $1/.config - test -z "$LIBSSO_PATH" || \ + test -z "$LIBSSO_SNOW3G_PATH" || \ sed -ri 's,(PMD_SNOW3G=)n,\1y,' $1/.config test -z "$LIBSSO_KASUMI_PATH" || \ sed -ri 's,(PMD_KASUMI=)n,\1y,' $1/.config -- 2.20.1