diff options
Diffstat (limited to 'src')
-rwxr-xr-x | src/dpdk/Makefile | 4 | ||||
-rw-r--r-- | src/dpdk/testpmd_proc.py | 6 | ||||
-rw-r--r-- | src/package-list.mk | 10 | ||||
-rw-r--r-- | src/trex/Makefile | 4 |
4 files changed, 14 insertions, 10 deletions
diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile index 4b4330d7..1a1521db 100755 --- a/src/dpdk/Makefile +++ b/src/dpdk/Makefile @@ -82,13 +82,13 @@ 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_VHOST=./CONFIG_RTE_LIBRTE_VHOST=y/g' $(CONFIG_FILE_LINUXAPP) diff --git a/src/dpdk/testpmd_proc.py b/src/dpdk/testpmd_proc.py index a8fa8eee..b89bcec2 100644 --- a/src/dpdk/testpmd_proc.py +++ b/src/dpdk/testpmd_proc.py @@ -27,8 +27,12 @@ from tools import tasks _TESTPMD_PROMPT = 'Done' +_NAME, _EXT = os.path.splitext(settings.getValue('LOG_FILE_VSWITCHD')) _LOG_FILE_VSWITCHD = os.path.join( - settings.getValue('LOG_DIR'), settings.getValue('LOG_FILE_VSWITCHD')) + settings.getValue('LOG_DIR'), + ("{name}_{uid}{ex}".format(name=_NAME, uid=settings.getValue( + 'LOG_TIMESTAMP'), ex=_EXT))) + class TestPMDProcess(tasks.Process): """Class wrapper for controlling a TestPMD instance. diff --git a/src/package-list.mk b/src/package-list.mk index d32a9ffd..1e40a60d 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -13,20 +13,20 @@ # dpdk section # DPDK_URL ?= git://dpdk.org/dpdk DPDK_URL ?= http://dpdk.org/git/dpdk -DPDK_TAG ?= v17.08 +DPDK_TAG ?= v18.11-rc2 # OVS section OVS_URL ?= https://github.com/openvswitch/ovs -OVS_TAG ?= v2.8.1 +OVS_TAG ?= v2.12.0 # VPP section VPP_URL ?= https://git.fd.io/vpp -VPP_TAG ?= v17.07 +VPP_TAG ?= v19.08.1 # QEMU section QEMU_URL ?= https://github.com/qemu/qemu.git -QEMU_TAG ?= v2.9.1 +QEMU_TAG ?= v3.1.1 # TREX section TREX_URL ?= https://github.com/cisco-system-traffic-generator/trex-core.git -TREX_TAG ?= v2.38 +TREX_TAG ?= v2.86 diff --git a/src/trex/Makefile b/src/trex/Makefile index 9a0704af..fd5c47bb 100644 --- a/src/trex/Makefile +++ b/src/trex/Makefile @@ -29,8 +29,8 @@ all: force_pull force_pull: $(TAG_DONE_FLAG) $(AT)cd $(WORK_DIR) && git pull $(TREX_URL) $(TREX_TAG) @echo "git pull done" - $(AT)wget https://raw.githubusercontent.com/phaethon/scapy/v0.18/scapy/layers/all.py -O $(WORK_DIR)/scripts/external_libs/scapy-2.3.1/python3/scapy/layers/all.py - @echo "orignal SCAPY 2.3.1 layers/all.py was restored" +# $(AT)wget https://raw.githubusercontent.com/phaethon/scapy/v0.18/scapy/layers/all.py -O $(WORK_DIR)/scripts/external_libs/scapy-2.3.1/python3/scapy/layers/all.py +# @echo "orignal SCAPY 2.3.1 layers/all.py was restored" $(WORK_DIR): $(AT)git clone $(TREX_URL) $(WORK_DIR) |