diff options
| author |   Xavier Simonart <xavier.simonart@intel.com> | 2019-05-28 15:31:43 +0200 |
|---|---|---|
| committer | Xavier Simonart <xavier.simonart@intel.com> | 2019-10-09 15:50:26 +0200 |
| commit | 4cc4dabe80eb7d19c20920b7ec20899d6a76a1dd (patch) | |
| tree | ee67e444dbc9806f1d63ba3d821788b422cb8bbf /VNFs/DPPD-PROX/Makefile | |
| parent | 73b79d29bc926a87e317c3881c197fc2db64e9d0 (diff) | |
Added support for DPDK 19.02 and 19.05
This includes supporting following API changes
- RTE_VER_... now in rte_config.h instead of rte_version.h
- <rte_ethdev.h> now seems required by <rte_eth_ctrl.h>
- rte_sched_port_pkt_write takes extra argument
- rte_sched_port_pkt_read_tree_path takes extra argument
- enum rte_meter_color replaced by rte_color
The extra argument, sched_port, is initialized based on qos_conf parameters.
Modes such as qinq_encap4 uses sched_port when doing classification, but does
not set qos_conf params. It inherits the sched_port from QoS
Change-Id: If8312918241e7d482161a7538f53faac6c303e86
Signed-off-by: Xavier Simonart <xavier.simonart@intel.com>
Diffstat (limited to 'VNFs/DPPD-PROX/Makefile')
| -rw-r--r-- | VNFs/DPPD-PROX/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/VNFs/DPPD-PROX/Makefile b/VNFs/DPPD-PROX/Makefile index b6cc603a..bc11f5d8 100644 --- a/VNFs/DPPD-PROX/Makefile +++ b/VNFs/DPPD-PROX/Makefile @@ -22,18 +22,26 @@ endif RTE_TARGET ?= x86_64-native-linuxapp-gcc rte_version_h := $(RTE_SDK)/$(RTE_TARGET)/include/rte_version.h +rte_config_h := $(RTE_SDK)/$(RTE_TARGET)/include/rte_config.h rte_ver_part = $(shell sed -n -e 's/^\#define\s*$1\s*\(.*\)$$/\1/p' $(rte_version_h)) +rte_config_part = $(shell sed -n -e 's/^\#define\s*$1\s*\(.*\)$$/\1/p' $(rte_config_h)) rte_ver_eval = $(shell printf '%u' $$(printf '0x%02x%02x%02x%02x' $1 $2 $3 $4)) rte_ver_MMLR = $(call rte_ver_eval,$(call \ rte_ver_part,RTE_VER_MAJOR),$(call \ rte_ver_part,RTE_VER_MINOR),$(call \ rte_ver_part,RTE_VER_PATCH_LEVEL),$(call \ rte_ver_part,RTE_VER_PATCH_RELEASE)) -rte_ver_YMMR = $(call rte_ver_eval,$(call \ +rte_version_YMMR = $(call rte_ver_eval,$(call \ rte_ver_part,RTE_VER_YEAR),$(call \ rte_ver_part,RTE_VER_MONTH),$(call \ rte_ver_part,RTE_VER_MINOR),$(call \ rte_ver_part,RTE_VER_RELEASE)) +rte_config_YMMR = $(call rte_ver_eval,$(call \ + rte_config_part,RTE_VER_YEAR),$(call \ + rte_config_part,RTE_VER_MONTH),$(call \ + rte_config_part,RTE_VER_MINOR),$(call \ + rte_config_part,RTE_VER_RELEASE)) +rte_ver_YMMR = $(if $(shell test $(rte_config_YMMR) -gt 0 && echo 'y'),$(rte_config_YMMR),$(rte_version_YMMR)) rte_ver_dpdk := $(if $(call rte_ver_part,RTE_VER_MAJOR),$(rte_ver_MMLR),$(rte_ver_YMMR)) rte_ver_comp = $(shell test $(rte_ver_dpdk) $5 $(call rte_ver_eval,$1,$2,$3,$4) && echo 'y') rte_ver_EQ = $(call rte_ver_comp,$1,$2,$3,$4,-eq) |