CaROS/meta-intel
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel synced 2026-01-04 16:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

meta-isg: dpdk: tidy up dpdk.inc & removed unnecessary patches

Browse Source 
This patch tidy up dpdk.inc and removing unnecessary patches.
Integrating common recipe from dpdk_1.8.0.bb and dpdk_2.0.0.bb.

Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: WU CHIA CHUAN <chia.chuan.wu@intel.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
This commit is contained in:
WU CHIA CHUAN 2015-07-28 16:05:08 +08:00 committed by Darren Hart
parent b88b9629f7
commit 76d81da784
6 changed files with 20 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meta-isg/common/recipes-extended/dpdk/dpdk.inc
View File

@ -3,6 +3,26 @@ HOMEPAGE = "http://dpdk.org"
LICENSE = "BSD & LGPLv2 & GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe"
SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \
file://dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch \
file://dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
file://dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch \
"
# dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat.
# fuse is in meta-filesystems and qat is not yet upstreamed.
# So adding mechanism to explicitly disable the use of fuse and qat.
# To enable, uncomment the below line or include in .bbappend.
# PACKAGECONFIG ?= " dpdk_qat vhost libvirt"
PACKAGECONFIG[dpdk_qat] = ",,qat"
PACKAGECONFIG[vhost] = ",,fuse"
PACKAGECONFIG[libvirt] = ",,libvirt"
export CONFIG_EXAMPLE_DPDK_QAT = "${@base_contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}"
export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@base_contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}"
export CONFIG_VHOST_ENABLED = "${@base_contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}"
RDEPENDS_${PN} += "python-subprocess"
DEPENDS = "virtual/kernel"
do_configure[depends] += "virtual/kernel:do_shared_workdir"

48
meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-dpdk-defconfig-select-RTE_MACHINE-type.patch
View File

@ -1,48 +0,0 @@
From 6eaf6b1a61321acb824f9672c12d0e30a2110f52 Mon Sep 17 00:00:00 2001
From: Ong Boon Leong <boon.leong.ong@intel.com>
Date: Mon, 16 Mar 2015 11:10:43 +0800
Subject: [PATCH] DPDK: defconfig: add selectable RTE_MACHINE option
In order to make sure that DPDK build environment config can handle the
package being built on different build machine for different target machine
which will have different x86 architecture intrinsics than the build machine,
we introduce DPDK_TARGET_MACH to be tunable from dpdk recipe. The machine
type can be under mk/machine folder.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
---
config/defconfig_i686-native-linuxapp-gcc | 2 +-
config/defconfig_x86_64-native-linuxapp-gcc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc
index a90de9b..c9a74a5 100644
--- a/config/defconfig_i686-native-linuxapp-gcc
+++ b/config/defconfig_i686-native-linuxapp-gcc
@@ -32,7 +32,7 @@
#include "common_linuxapp"
-CONFIG_RTE_MACHINE="native"
+CONFIG_RTE_MACHINE=$(DPDK_TARGET_MACH)
CONFIG_RTE_ARCH="i686"
CONFIG_RTE_ARCH_I686=y
diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc
index 60baf5b..0e4802d 100644
--- a/config/defconfig_x86_64-native-linuxapp-gcc
+++ b/config/defconfig_x86_64-native-linuxapp-gcc
@@ -32,7 +32,7 @@
#include "common_linuxapp"
-CONFIG_RTE_MACHINE="native"
+CONFIG_RTE_MACHINE=$(DPDK_TARGET_MACH)
CONFIG_RTE_ARCH="x86_64"
CONFIG_RTE_ARCH_X86_64=y
--
1.7.9.5

43
meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-dpdk-enable-build-config-VHOST-in-common_linuxapp-config.patch
View File

@ -1,43 +0,0 @@
From c1a59d62f2aa7656060d8ebcc8e45e852d931ff1 Mon Sep 17 00:00:00 2001
From: Ong Boon Leong <boon.leong.ong@intel.com>
Date: Tue, 17 Feb 2015 00:23:12 +0800
Subject: [PATCH] dpdk: enable VHOST build config in common_linuxapp config
Introduce CONFIG_VHOST_ENABLED for package config selection purpose in
building vhost feature.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
---
config/common_linuxapp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/common_linuxapp b/config/common_linuxapp
index 2f9643b..67f5edb 100644
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -361,9 +361,9 @@ CONFIG_RTE_LIBRTE_PIPELINE=y
#
CONFIG_RTE_LIBRTE_KNI=y
CONFIG_RTE_KNI_KO_DEBUG=n
-CONFIG_RTE_KNI_VHOST=n
+CONFIG_RTE_KNI_VHOST=$(CONFIG_VHOST_ENABLED)
CONFIG_RTE_KNI_VHOST_MAX_CACHE_SIZE=1024
-CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n
+CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=$(CONFIG_VHOST_ENABLED)
CONFIG_RTE_KNI_VHOST_DEBUG_RX=n
CONFIG_RTE_KNI_VHOST_DEBUG_TX=n
@@ -372,7 +372,7 @@ CONFIG_RTE_KNI_VHOST_DEBUG_TX=n
# fuse-devel is needed to run vhost.
# fuse-devel enables user space char driver development
#
-CONFIG_RTE_LIBRTE_VHOST=n
+CONFIG_RTE_LIBRTE_VHOST=$(CONFIG_VHOST_ENABLED)
CONFIG_RTE_LIBRTE_VHOST_DEBUG=n
#
--
1.7.9.5

50
meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-dpdk-enable-VHOST-and-ip_fragmentation-in-common_linuxapp.patch
View File

@ -1,50 +0,0 @@
From 3d3c03d947394696565b3bb7bed8c900de057a28 Mon Sep 17 00:00:00 2001
From: WU CHIA CHUAN <chia.chuan.wu@intel.com>
Date: Thu, 2 Jul 2015 15:59:18 +0800
Subject: [PATCH] dpdk enable VHOST and ip_fragmentation in common_linuxapp config
Introduce CONFIG_VHOST_ENABLED for package config selection purpose in
building vhost feature.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: WU CHIA CHUAN <chia.chuan.wu@intel.com>
---
config/common_linuxapp | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/config/common_linuxapp b/config/common_linuxapp
index 0b25f34..000f950 100644
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -406,19 +406,24 @@ CONFIG_RTE_LIBRTE_PIPELINE=y
CONFIG_RTE_LIBRTE_KNI=y
CONFIG_RTE_KNI_PREEMPT_DEFAULT=y
CONFIG_RTE_KNI_KO_DEBUG=n
-CONFIG_RTE_KNI_VHOST=n
+CONFIG_RTE_KNI_VHOST=$(CONFIG_VHOST_ENABLED)
CONFIG_RTE_KNI_VHOST_MAX_CACHE_SIZE=1024
-CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n
+CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=$(CONFIG_VHOST_ENABLED)
CONFIG_RTE_KNI_VHOST_DEBUG_RX=n
CONFIG_RTE_KNI_VHOST_DEBUG_TX=n
#
+# Compile ip_fragmentation
+#
+CONFIG_RTE_IP_FRAG=y
+
+#
# Compile vhost library
# fuse-devel is needed to run vhost-cuse.
# fuse-devel enables user space char driver development
# vhost-user is turned on by default.
#
-CONFIG_RTE_LIBRTE_VHOST=n
+CONFIG_RTE_LIBRTE_VHOST=$(CONFIG_VHOST_ENABLED)
CONFIG_RTE_LIBRTE_VHOST_USER=y
CONFIG_RTE_LIBRTE_VHOST_DEBUG=n
--
1.7.9.5

22
meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb
View File

@ -1,33 +1,11 @@
include dpdk.inc
SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \
file://dpdk-1.8.0-dpdk-enable-build-config-VHOST-in-common_linuxapp-config.patch \
file://dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch \
file://dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
file://dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch \
file://dpdk-1.8.0-and-2.0.0-dpdk-defconfig-select-RTE_MACHINE-type.patch \
"
SRC_URI[dpdk.md5sum] = "11ad8785aaa869cc87265bcb8d828f22"
SRC_URI[dpdk.sha256sum] = "9f5386830bd999355182e20408f3fc2cfa0802a4497fdded8d43202feede1939"
export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
export ARCHDIR = "generic"
# dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat.
# fuse is in meta-filesystems and qat is not yet upstreamed.
# So adding mechanism to explicitly disable the use of fuse and qat.
# To enable, uncomment the below line or include in .bbappend.
# PACKAGECONFIG ?= " dpdk_qat vhost libvirt"
PACKAGECONFIG[dpdk_qat] = ",,qat"
PACKAGECONFIG[vhost] = ",,fuse"
PACKAGECONFIG[libvirt] = ",,libvirt"
export CONFIG_EXAMPLE_DPDK_QAT = "${@base_contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}"
export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@base_contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}"
export CONFIG_VHOST_ENABLED = "${@base_contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}"
do_install_append () {
install -m 0755 -d ${D}/${INSTALL_PATH}/${RTE_TARGET}/hostapp

22
meta-isg/common/recipes-extended/dpdk/dpdk_2.0.0.bb
View File

@ -1,29 +1,7 @@
include dpdk.inc
SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \
file://dpdk-2.0.0-dpdk-enable-VHOST-and-ip_fragmentation-in-common_linuxapp.patch \
file://dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch \
file://dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
file://dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch \
file://dpdk-1.8.0-and-2.0.0-dpdk-defconfig-select-RTE_MACHINE-type.patch \
"
SRC_URI[dpdk.md5sum] = "e9e7935c9eec920841ad373949514934"
SRC_URI[dpdk.sha256sum] = "643789a3be5ba44dd84d6b248cdf5471b260f8736dada177dadf076aebfbff3f"
export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
export ARCHDIR = "generic"
# dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat.
# fuse is in meta-filesystems and qat is not yet upstreamed.
# So adding mechanism to explicitly disable the use of fuse and qat.
# To enable, uncomment the below line or include in .bbappend.
# PACKAGECONFIG ?= " dpdk_qat vhost libvirt"
PACKAGECONFIG[dpdk_qat] = ",,qat"
PACKAGECONFIG[vhost] = ",,fuse"
PACKAGECONFIG[libvirt] = ",,libvirt"
export CONFIG_EXAMPLE_DPDK_QAT = "${@base_contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}"
export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@base_contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}"
export CONFIG_VHOST_ENABLED = "${@base_contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}"