ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "dpdk: build sw cryptodev support with make verify"

Browse Source 
This reverts commit 0e2e10b77d.

Change-Id: I3c1737f391b6ed127f92416f06449216e79859bb
Signed-off-by: Peter Mikus <pmikus@cisco.com>
This commit is contained in:
Peter Mikus
2017-05-31 15:23:59 +00:00
parent c2ebcbb89b
commit ad625f55db
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -427,24 +427,22 @@ define banner
@echo " " @echo " "
endef endef
verify: install-dep $(BR)/.bootstrap.ok verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
make -C dpdk install-$(PKG) DPDK_CRYPTO_SW_PMD=y
$(call banner,"Building for PLATFORM=vpp using gcc") $(call banner,"Building for PLATFORM=vpp using gcc")
@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages \ @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
vpp_uses_dpdk_cryptodev_sw=yes
ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04) ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
$(call banner,"Installing dependencies") $(call banner,"Installing dependencies")
@sudo -E apt-get update @sudo -E apt-get update
@sudo -E apt-get $(CONFIRM) $(FORCE) install clang @sudo -E apt-get $(CONFIRM) $(FORCE) install clang
$(call banner,"Building for PLATFORM=vpp using clang") $(call banner,"Building for PLATFORM=vpp using clang")
@make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang \ @make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
wipe-all install-packages vpp_uses_dpdk_cryptodev_sw=yes
endif endif
$(call banner,"Building sample-plugin") $(call banner,"Building sample-plugin")
@make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install @make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
$(call banner,"Building $(PKG) packages") $(call banner,"Building $(PKG) packages")
@make pkg-$(PKG) vpp_uses_dpdk_cryptodev_sw=yes @make pkg-$(PKG)
ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04) ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
@make test @make test
endif endif

13
dpdk/Makefile
View File

@@ -26,7 +26,7 @@ DPDK_MLX5_PMD ?= n
B := $(DPDK_BUILD_DIR) B := $(DPDK_BUILD_DIR)
I := $(DPDK_INSTALL_DIR) I := $(DPDK_INSTALL_DIR)
DPDK_VERSION ?= 17.05 DPDK_VERSION ?= 17.05
PKG_SUFFIX ?= vpp4 PKG_SUFFIX ?= vpp5
DPDK_BASE_URL ?= http://fast.dpdk.org/rel DPDK_BASE_URL ?= http://fast.dpdk.org/rel
DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.xz DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.xz
DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL) DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
@@ -41,7 +41,6 @@ AESNIMB_LIB_SOURCE := $(B)/intel-ipsec-mb-0.44-gcm.2
ISA_L_CRYPTO_LIB_TARBALL := isa_l_crypto.tar.gz ISA_L_CRYPTO_LIB_TARBALL := isa_l_crypto.tar.gz
ISA_L_CRYPTO_LIB_TARBALL_URL := http://github.com/01org/isa-l_crypto/archive/master.tar.gz ISA_L_CRYPTO_LIB_TARBALL_URL := http://github.com/01org/isa-l_crypto/archive/master.tar.gz
ISA_L_CRYPTO_LIB_SOURCE := $(B)/isa-l_crypto-master ISA_L_CRYPTO_LIB_SOURCE := $(B)/isa-l_crypto-master
ISA_L_CRYPTO_INSTALL_DIR := $(ISA_L_CRYPTO_LIB_SOURCE)/install
endif endif
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
@@ -91,8 +90,8 @@ DPDK_EXTRA_CFLAGS := -g -O0
endif endif
ifeq ($(DPDK_CRYPTO_SW_PMD),y) ifeq ($(DPDK_CRYPTO_SW_PMD),y)
DPDK_EXTRA_CFLAGS += -I$(ISA_L_CRYPTO_INSTALL_DIR)/include DPDK_EXTRA_CFLAGS += -I$(I)/include
DPDK_EXTRA_LDFLAGS += -L$(ISA_L_CRYPTO_INSTALL_DIR)/lib DPDK_EXTRA_LDFLAGS += -L$(I)/lib
DPDK_MAKE_EXTRA_ARGS += AESNI_MULTI_BUFFER_LIB_PATH=$(AESNIMB_LIB_SOURCE) DPDK_MAKE_EXTRA_ARGS += AESNI_MULTI_BUFFER_LIB_PATH=$(AESNIMB_LIB_SOURCE)
endif endif
@@ -168,14 +167,12 @@ $(CURDIR)/$(AESNIMB_LIB_TARBALL):
then cp $(DPDK_DOWNLOAD_DIR)/$(AESNIMB_LIB_TARBALL) $(CURDIR) ; \ then cp $(DPDK_DOWNLOAD_DIR)/$(AESNIMB_LIB_TARBALL) $(CURDIR) ; \
else curl -o $@ -LO $(AESNIMB_LIB_TARBALL_URL) ; \ else curl -o $@ -LO $(AESNIMB_LIB_TARBALL_URL) ; \
fi fi
@rm -f $(B)/.download.ok
$(CURDIR)/$(ISA_L_CRYPTO_LIB_TARBALL): $(CURDIR)/$(ISA_L_CRYPTO_LIB_TARBALL):
@if [ -e $(DPDK_DOWNLOAD_DIR)/$(ISA_L_CRYPTO_LIB_TARBALL) ] ; \ @if [ -e $(DPDK_DOWNLOAD_DIR)/$(ISA_L_CRYPTO_LIB_TARBALL) ] ; \
then cp $(DPDK_DOWNLOAD_DIR)/$(ISA_L_CRYPTO_LIB_TARBALL) $(CURDIR) ; \ then cp $(DPDK_DOWNLOAD_DIR)/$(ISA_L_CRYPTO_LIB_TARBALL) $(CURDIR) ; \
else curl -o $@ -LO $(ISA_L_CRYPTO_LIB_TARBALL_URL) ; \ else curl -o $@ -LO $(ISA_L_CRYPTO_LIB_TARBALL_URL) ; \
fi fi
@rm -f $(B)/.download.ok
DPDK_DOWNLOADS = $(CURDIR)/$(DPDK_TARBALL) DPDK_DOWNLOADS = $(CURDIR)/$(DPDK_TARBALL)
ifeq ($(DPDK_CRYPTO_SW_PMD),y) ifeq ($(DPDK_CRYPTO_SW_PMD),y)
@@ -236,10 +233,8 @@ ifeq ($(DPDK_CRYPTO_SW_PMD),y)
make -C $(AESNIMB_LIB_SOURCE) -j NO_GCM=y make -C $(AESNIMB_LIB_SOURCE) -j NO_GCM=y
cp $(AESNIMB_LIB_SOURCE)/libIPSec_MB.a $(I)/lib/ cp $(AESNIMB_LIB_SOURCE)/libIPSec_MB.a $(I)/lib/
# Build ISA-L Crypto library # Build ISA-L Crypto library
cd $(ISA_L_CRYPTO_LIB_SOURCE) && ./autogen.sh && \ cd $(ISA_L_CRYPTO_LIB_SOURCE) && ./autogen.sh && ./configure --prefix=$(I)
./configure --prefix=$(ISA_L_CRYPTO_INSTALL_DIR) CFLAGS='-fPIC -DPIC -O2'
make -C $(ISA_L_CRYPTO_LIB_SOURCE) -j install make -C $(ISA_L_CRYPTO_LIB_SOURCE) -j install
cp $(ISA_L_CRYPTO_INSTALL_DIR)/lib/libisal_crypto.* $(I)/lib/
endif endif
@make $(DPDK_MAKE_ARGS) install @make $(DPDK_MAKE_ARGS) install
@touch $@ @touch $@