summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWU CHIA CHUAN <chia.chuan.wu@intel.com>2015-07-28 08:05:09 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2015-07-29 20:06:55 (GMT)
commitbcfa8d0e06525c038b95abe5a728a039e9a4e6d0 (patch)
tree994755739f6772ef4916b12c53ef3dd52579094c
parent0e009603a34380f84847803c815d029df486f890 (diff)
downloadmeta-intel-bcfa8d0e06525c038b95abe5a728a039e9a4e6d0.tar.gz
meta-isg: dpdk: fix issue in build configuration variables
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@intel.com> Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com> Signed-off-by: WU CHIA CHUAN <chia.chuan.wu@intel.com> Tested-by: WU CHIA CHUAN <chia.chuan.wu@intel.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com> (cherry picked from commit d48ca52bbe6d768a6eefdcede121eeb89ba79e4b) Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--meta-isg/common/recipes-extended/dpdk/dpdk.inc9
1 files changed, 9 insertions, 0 deletions
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 () {
66 ############################################################# 66 #############################################################
67 unset prefix 67 unset prefix
68 68
69 # Fix-up CONFIG_RTE_MACHINE based on target machine
70 sed -e "s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#" -i ${S}/config/defconfig_x86_64-native-linuxapp-gcc
71 sed -e "s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#" -i ${S}/config/defconfig_i686-native-linuxapp-gcc
72
73 # Fix-up vhost configs based on package config
74 sed -e "s#CONFIG_RTE_KNI_VHOST=n#CONFIG_RTE_KNI_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/common_linuxapp
75 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
76 sed -e "s#CONFIG_RTE_LIBRTE_VHOST=n#CONFIG_RTE_LIBRTE_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/common_linuxapp
77
69 make O=$RTE_TARGET T=$RTE_TARGET config 78 make O=$RTE_TARGET T=$RTE_TARGET config
70} 79}
71 80