aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-03-30 13:51:12 -0700
committerCalifornia Sullivan <california.l.sullivan@intel.com>2018-04-03 17:58:42 -0700
commitcc4d9b770affe62863f39dccc35a6bc091710457 (patch)
tree66f7bebb120e5bc5424be2279afd30769aaba64d
parent6863a1c00269394390b526ca4806204a969be970 (diff)
downloadmeta-dpdk-cc4d9b770affe62863f39dccc35a6bc091710457.tar.gz
meta-dpdk-cc4d9b770affe62863f39dccc35a6bc091710457.tar.bz2
meta-dpdk-cc4d9b770affe62863f39dccc35a6bc091710457.zip
dpdk.inc: fix missing numa.h by disabling NUMA options by default
Otherwise we get this: | dpdk-18.02/lib/librte_eal/linuxapp/eal/eal_memory.c:27:10: fatal error: numa.h: No such file or directory | #include <numa.h> | ^~~~~~~~ | compilation terminated. Use PACKAGECONFIG to optionally enable the numa option. Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
-rw-r--r--recipes-extended/dpdk/dpdk.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index ce4e8bc..0818841 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -29,10 +29,12 @@ COMPATIBLE_HOST_libc-musl_class-target = "null"
PACKAGECONFIG[dpdk_qat] = ",,virtual/qat"
PACKAGECONFIG[vhost] = ",,fuse"
PACKAGECONFIG[libvirt] = ",,libvirt"
+PACKAGECONFIG[numa] = ",,numactl"
export CONFIG_EXAMPLE_DPDK_QAT = "${@bb.utils.contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}"
export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@bb.utils.contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}"
export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}"
+export CONFIG_HAVE_NUMA = "${@bb.utils.contains('PACKAGECONFIG', 'numa', 'y', 'n', d)}"
RDEPENDS_${PN} += "python-subprocess virtual/libibverbs"
DEPENDS = "virtual/kernel virtual/libibverbs"
@@ -80,6 +82,8 @@ do_configure () {
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
+ sed -e "s#CONFIG_RTE_LIBRTE_VHOST_NUMA=.*#CONFIG_RTE_LIBRTE_VHOST_NUMA=${CONFIG_HAVE_NUMA}#" -i ${S}/config/common_linuxapp
+ sed -e "s#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=.*#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=${CONFIG_HAVE_NUMA}#" -i ${S}/config/common_linuxapp
make O=$RTE_TARGET T=$RTE_TARGET config
}