[meta-intel] [meta-intel[meta-isg][fido][master][PATCH 2/7] meta-isg: dpdk: fix issue in build configuration variables

[chia.chuan.wu at intel.com]

From: WU CHIA CHUAN <chia.chuan.wu at intel.com>

This patch fixes issue in build configuration variables that were
not correctly parsed by do_configure() task.The environment variables
are not evaluated because the config files under dpdk/config/ folder
are not parsed by Makefile but instead by cpp compiler.

Reported-by: Anuj Mittal <anujx.mittal at intel.com>
Signed-off-by: Ong Boon Leong <boon.leong.ong at intel.com>
Signed-off-by: WU CHIA CHUAN <chia.chuan.wu at intel.com>
Tested-by: WU CHIA CHUAN <chia.chuan.wu at intel.com>
---
 meta-isg/common/recipes-extended/dpdk/dpdk.inc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
index 59946cf..3106959 100644
--- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
@@ -66,6 +66,15 @@ do_configure () {
 	#############################################################
 	unset prefix
 
+	# Fix-up CONFIG_RTE_MACHINE based on target machine
+	sed -e "s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#" -i ${S}/config/defconfig_x86_64-native-linuxapp-gcc
+	sed -e "s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#" -i ${S}/config/defconfig_i686-native-linuxapp-gcc
+
+	# Fix-up vhost configs based on package config
+	sed -e "s#CONFIG_RTE_KNI_VHOST=n#CONFIG_RTE_KNI_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/common_linuxapp
+	sed -e "s#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/common_linuxapp
+	sed -e "s#CONFIG_RTE_LIBRTE_VHOST=n#CONFIG_RTE_LIBRTE_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/common_linuxapp
+
 	make O=$RTE_TARGET T=$RTE_TARGET config
 }
 
-- 
1.9.1