aboutsummaryrefslogtreecommitdiffstats
path: root/src/dpdk/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'src/dpdk/Makefile')
-rw-r--r--src/dpdk/Makefile28
1 files changed, 19 insertions, 9 deletions
diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile
index f13449c8..44da38c9 100644
--- a/src/dpdk/Makefile
+++ b/src/dpdk/Makefile
@@ -1,19 +1,20 @@
# makefile to manage dpdk package
#
-# Copyright 2015-2017 OPNFV
+# Copyright 2015-2019 Intel Corporation and OPNFV. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
#
# Contributors:
@@ -21,6 +22,7 @@
# Martin Klozik, Intel Corporation.
# Christian Trautman, Red Hat Inc.
# Maryam Tahhan, Intel Corporation.
+# Jabir Kanhira Kadavathu, Intel Corporation.
include ../mk/master.mk
include ../package-list.mk
@@ -33,14 +35,14 @@ TAG_DONE_FLAG = $(WORK_DIR)/.$(DPDK_TAG).tag.done
# VHOST configuration options are stored in different files based on DPDK version
# v1.2.3r0-v1.6.0r2 - configuration inside config/defconfig_x86_64-default-linuxapp-gcc
-# v1.7.0-rc1-v2.2.0 - configuration inside config/common_linuxapp
-# v16 and newer - configuration split between config/common_linuxapp and config/common_base
+# v1.7.0-rc1-v2.2.0 - configuration inside config/common_linux
+# v16 and newer - configuration split between config/common_linux and config/common_base
DPDK_TAG_MAJOR = $(shell echo $(DPDK_TAG) | cut -d. -f1)
DPDK_TAG_MINOR = $(shell echo $(DPDK_TAG) | cut -d. -f2)
ifeq ($(DPDK_TAG_MAJOR),v1)
ifeq ($(DPDK_TAG_MINOR), $(filter $(DPDK_TAG_MINOR), 7 8))
DPDK_TARGET = x86_64-native-linuxapp-gcc
- CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linuxapp
+ CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linux
else
DPDK_TARGET = x86_64-default-linuxapp-gcc
CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/defconfig_x86_64-default-linuxapp-gcc
@@ -48,11 +50,11 @@ endif
else
ifeq ($(DPDK_TAG_MAJOR),v2)
DPDK_TARGET = x86_64-native-linuxapp-gcc
- CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linuxapp
+ CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linux
else
DPDK_TARGET = x86_64-native-linuxapp-gcc
CONFIG_FILE_BASE = $(WORK_DIR)/config/common_base
- CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linuxapp
+ CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linux
endif
endif
@@ -77,16 +79,21 @@ else
$(AT)sed -i -e 's/CONFIG_RTE_EAL_PMD_PATH=.*/CONFIG_RTE_EAL_PMD_PATH=\"\/usr\/lib\/dpdk-pmd\/\"/g' $(CONFIG_FILE_LINUXAPP)
$(AT)sed -i -e 's/CONFIG_RTE_BUILD_COMBINE_LIBS=./CONFIG_RTE_BUILD_COMBINE_LIBS=y/g' $(CONFIG_FILE_LINUXAPP)
endif
+# do not build kernel module under docker
+ifdef DOCKER
+ $(AT)sed -i -e 's/CONFIG_RTE_EAL_IGB_UIO=y/CONFIG_RTE_EAL_IGB_UIO=n/' $(CONFIG_FILE_LINUXAPP)
+ $(AT)sed -i -e 's/CONFIG_RTE_KNI_KMOD=y/CONFIG_RTE_KNI_KMOD=n/' $(CONFIG_FILE_LINUXAPP)
+endif
# CentOS 7.3 specific config changes to compile
ifeq ($(ID),"centos")
ifeq ($(VERSION_ID),"7")
- $(AT)sed -i.bak s@'SRCS-y += ethtool/igb/igb_main.c'@'#SRCS-y += ethtool/igb/igb_main.c'@g $(WORK_DIR)/lib/librte_eal/linuxapp/kni/Makefile
+ $(AT)sed -i.bak s@'SRCS-y += ethtool/igb/igb_main.c'@'#SRCS-y += ethtool/igb/igb_main.c'@g $(WORK_DIR)/kernel/linux/kni/Makefile
endif
endif
# RHEL 7.3 specific config changes to compile
ifeq ($(ID),"rhel")
ifeq ($(VERSION_ID),"7.3")
- $(AT)sed -i.bak s@'SRCS-y += ethtool/igb/igb_main.c'@'#SRCS-y += ethtool/igb/igb_main.c'@g $(WORK_DIR)/lib/librte_eal/linuxapp/kni/Makefile
+ $(AT)sed -i.bak s@'SRCS-y += ethtool/igb/igb_main.c'@'#SRCS-y += ethtool/igb/igb_main.c'@g $(WORK_DIR)/kernel/linux/kni/Makefile
endif
endif
$(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_KNI=./CONFIG_RTE_LIBRTE_KNI=n/g' $(CONFIG_FILE_LINUXAPP)
@@ -98,7 +105,10 @@ install: $(INSTALL_TARGET)
$(AT)cd $(WORK_DIR); sudo make -j install prefix=/usr; cd -
$(AT)sudo mkdir -p /usr/lib/dpdk-pmd
$(AT)find /usr/lib -type f -name 'librte_pmd*' | while read path; do sudo ln -fs $$path /usr/lib/dpdk-pmd/$$(echo $$path | grep -o 'librte_.*so'); done
+# under docker there won't be kernel module available
+ifndef DOCKER
$(AT)sudo cp -a $(WORK_DIR)/build/kmod $(INSTALL_DIR)/lib/modules/$(KERNEL_VERSION)
+endif
@echo "install done"
# hard way to clean and clobber