From b3f37c6f02ab2de7e78bcfb9ae1ce78cb11b208b Mon Sep 17 00:00:00 2001 From: WU CHIA CHUAN Date: Fri, 10 Jul 2015 21:23:51 +0800 Subject: meta-isg: dpdk: renaming patches which are common to DPDK v1.8 and DPDK v2.0 For patches which are common to DPDK v1.8 and DPDK v2.0, they are renamed to following file naming format for clarity dpdk-1.8.0-and-2.0.0*.patch. Signed-off-by: WU CHIA CHUAN Signed-off-by: Ong Boon Leong Signed-off-by: Saul Wold --- ...-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch | 52 ---------------------- ....0-add-sysroot-option-within-app-makefile.patch | 33 -------------- ...-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch | 52 ++++++++++++++++++++++ ....0-add-sysroot-option-within-app-makefile.patch | 33 ++++++++++++++ ....0-dpdk-defconfig-select-RTE_MACHINE-type.patch | 48 ++++++++++++++++++++ ...dd-config-variable-to-enable-disable-dpdk.patch | 44 ++++++++++++++++++ ....0-dpdk-defconfig-select-RTE_MACHINE-type.patch | 48 -------------------- ...d-config-variable-to-enable-disable-dpdk_.patch | 44 ------------------ .../common/recipes-extended/dpdk/dpdk_1.8.0.bb | 8 ++-- 9 files changed, 181 insertions(+), 181 deletions(-) delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-add-sysroot-option-within-app-makefile.patch create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-dpdk-defconfig-select-RTE_MACHINE-type.patch create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-dpdk-defconfig-select-RTE_MACHINE-type.patch delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-examples-add-config-variable-to-enable-disable-dpdk_.patch (limited to 'meta-isg') diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch deleted file mode 100644 index bfef2218..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 69238a0b910bca43ef13154718a7a6c9b0dabe8a Mon Sep 17 00:00:00 2001 -From: Ong Boon Leong -Date: Thu, 25 Jun 2015 15:39:38 +0800 -Subject: [PATCH] dpdk v1.8.0: add RTE_KERNELDIR_OUT to split kernel build - artifact - -Introduce RTE_KERNELDIR_OUT to be the path to which kernel build -artifacts are located. This is for matching the workflow change -since Yocto Project v1.8 onwards whereby tmp/work-shared contains -separate directories for kernel source and kernel artifacts. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Ong Boon Leong ---- - mk/rte.module.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mk/rte.module.mk b/mk/rte.module.mk -index 7bf77c1..d4253a5 100644 ---- a/mk/rte.module.mk -+++ b/mk/rte.module.mk -@@ -77,7 +77,7 @@ build: _postbuild - # build module - $(MODULE).ko: $(SRCS_LINKS) - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi -- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ -+ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ - CC=$(KERNELCC) CROSS_COMPILE=$(CROSS) V=$(if $V,1,0) - - # install module in $(RTE_OUTPUT)/kmod -@@ -88,7 +88,7 @@ $(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko - - # install module - modules_install: -- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ -+ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ - modules_install - - .PHONY: clean -@@ -98,7 +98,7 @@ clean: _postclean - .PHONY: doclean - doclean: - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi -- $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean -+ $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) clean - @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ - if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) - @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi --- -1.7.9.5 - diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-add-sysroot-option-within-app-makefile.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-add-sysroot-option-within-app-makefile.patch deleted file mode 100644 index 02c7dc3c..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-add-sysroot-option-within-app-makefile.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3112250f6452215890fc7db73c8127e111af956f Mon Sep 17 00:00:00 2001 -From: Ong Boon Leong -Date: Thu, 2 Jul 2015 23:51:01 +0800 -Subject: [PATCH] dpdk v1.8.0: add --sysroot option within app makefile - -Upstream-Status: Inappropriate [configuration] - -in DPDK v1.8.0, rte.app.mk has been changed to add -Wl, to -all items listed under EXTRA_LDFLAGS. It causes --sysroot= - to not setup correctly when we depends on gcc to setup -for GNU ld. - -Signed-off-by: Ong Boon Leong ---- - mk/rte.app.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mk/rte.app.mk b/mk/rte.app.mk -index e1a0dbf..9528588 100644 ---- a/mk/rte.app.mk -+++ b/mk/rte.app.mk -@@ -259,7 +259,7 @@ ifeq ($(LINK_USING_CC),1) - override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) - O_TO_EXE = $(CC) $(CFLAGS) $(LDFLAGS_$(@)) \ - -Wl,-Map=$(@).map,--cref -o $@ $(OBJS-y) $(call linkerprefix,$(LDFLAGS)) \ -- $(EXTRA_LDFLAGS) $(call linkerprefix,$(LDLIBS)) -+ $(EXTRA_LDFLAGS) $(SYSROOTPATH) $(call linkerprefix,$(LDLIBS)) - else - O_TO_EXE = $(LD) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - -Map=$(@).map --cref -o $@ $(OBJS-y) $(LDLIBS) --- -1.7.9.5 - diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch new file mode 100644 index 00000000..bfef2218 --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch @@ -0,0 +1,52 @@ +From 69238a0b910bca43ef13154718a7a6c9b0dabe8a Mon Sep 17 00:00:00 2001 +From: Ong Boon Leong +Date: Thu, 25 Jun 2015 15:39:38 +0800 +Subject: [PATCH] dpdk v1.8.0: add RTE_KERNELDIR_OUT to split kernel build + artifact + +Introduce RTE_KERNELDIR_OUT to be the path to which kernel build +artifacts are located. This is for matching the workflow change +since Yocto Project v1.8 onwards whereby tmp/work-shared contains +separate directories for kernel source and kernel artifacts. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Ong Boon Leong +--- + mk/rte.module.mk | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mk/rte.module.mk b/mk/rte.module.mk +index 7bf77c1..d4253a5 100644 +--- a/mk/rte.module.mk ++++ b/mk/rte.module.mk +@@ -77,7 +77,7 @@ build: _postbuild + # build module + $(MODULE).ko: $(SRCS_LINKS) + @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi +- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ ++ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ + CC=$(KERNELCC) CROSS_COMPILE=$(CROSS) V=$(if $V,1,0) + + # install module in $(RTE_OUTPUT)/kmod +@@ -88,7 +88,7 @@ $(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko + + # install module + modules_install: +- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ ++ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ + modules_install + + .PHONY: clean +@@ -98,7 +98,7 @@ clean: _postclean + .PHONY: doclean + doclean: + @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi +- $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean ++ $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) clean + @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ + if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) + @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi +-- +1.7.9.5 + diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch new file mode 100644 index 00000000..02c7dc3c --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch @@ -0,0 +1,33 @@ +From 3112250f6452215890fc7db73c8127e111af956f Mon Sep 17 00:00:00 2001 +From: Ong Boon Leong +Date: Thu, 2 Jul 2015 23:51:01 +0800 +Subject: [PATCH] dpdk v1.8.0: add --sysroot option within app makefile + +Upstream-Status: Inappropriate [configuration] + +in DPDK v1.8.0, rte.app.mk has been changed to add -Wl, to +all items listed under EXTRA_LDFLAGS. It causes --sysroot= + to not setup correctly when we depends on gcc to setup +for GNU ld. + +Signed-off-by: Ong Boon Leong +--- + mk/rte.app.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mk/rte.app.mk b/mk/rte.app.mk +index e1a0dbf..9528588 100644 +--- a/mk/rte.app.mk ++++ b/mk/rte.app.mk +@@ -259,7 +259,7 @@ ifeq ($(LINK_USING_CC),1) + override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) + O_TO_EXE = $(CC) $(CFLAGS) $(LDFLAGS_$(@)) \ + -Wl,-Map=$(@).map,--cref -o $@ $(OBJS-y) $(call linkerprefix,$(LDFLAGS)) \ +- $(EXTRA_LDFLAGS) $(call linkerprefix,$(LDLIBS)) ++ $(EXTRA_LDFLAGS) $(SYSROOTPATH) $(call linkerprefix,$(LDLIBS)) + else + O_TO_EXE = $(LD) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ + -Map=$(@).map --cref -o $@ $(OBJS-y) $(LDLIBS) +-- +1.7.9.5 + diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-dpdk-defconfig-select-RTE_MACHINE-type.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-dpdk-defconfig-select-RTE_MACHINE-type.patch new file mode 100644 index 00000000..979541e9 --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-dpdk-defconfig-select-RTE_MACHINE-type.patch @@ -0,0 +1,48 @@ +From 6eaf6b1a61321acb824f9672c12d0e30a2110f52 Mon Sep 17 00:00:00 2001 +From: Ong Boon Leong +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 +--- + 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 + diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch new file mode 100644 index 00000000..c86c1a1d --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch @@ -0,0 +1,44 @@ +From 54c95ca8f76f412c94a9f61e3756420ac554310b Mon Sep 17 00:00:00 2001 +From: Ong Boon Leong +Date: Thu, 12 Feb 2015 16:33:49 +0800 +Subject: [PATCH] examples: add config variable to enable/disable dpdk_qat + +Upstream-Status: Inappropriate [configuration] + +This patch adss following example build configs: + +1) CONFIG_EXAMPLE_DPDK_QAT is used to control dpdk_qat example + by PACKAGECONFIG. + +2) CONFIG_EXAMPLE_VM_POWER_MANAGER is used to control vm_power_manager + example by PACKAGECONFIG. + +Signed-off-by: Ong Boon Leong +--- + examples/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/examples/Makefile b/examples/Makefile +index 81f1d2f..7e9c7bd 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -40,7 +40,7 @@ include $(RTE_SDK)/mk/rte.vars.mk + DIRS-y += cmdline + DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor + ifneq ($(ICP_ROOT),) +-DIRS-y += dpdk_qat ++DIRS-$(CONFIG_EXAMPLE_DPDK_QAT) += dpdk_qat + endif + DIRS-y += exception_path + DIRS-y += helloworld +@@ -68,6 +68,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost + DIRS-$(CONFIG_RTE_LIBRTE_XEN_DOM0) += vhost_xen + DIRS-y += vmdq + DIRS-y += vmdq_dcb +-DIRS-y += vm_power_manager ++DIRS-$(CONFIG_EXAMPLE_VM_POWER_MANAGER) += vm_power_manager + + include $(RTE_SDK)/mk/rte.extsubdir.mk +-- +1.7.9.5 + diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-dpdk-defconfig-select-RTE_MACHINE-type.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-dpdk-defconfig-select-RTE_MACHINE-type.patch deleted file mode 100644 index 979541e9..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-dpdk-defconfig-select-RTE_MACHINE-type.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6eaf6b1a61321acb824f9672c12d0e30a2110f52 Mon Sep 17 00:00:00 2001 -From: Ong Boon Leong -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 ---- - 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 - diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-examples-add-config-variable-to-enable-disable-dpdk_.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-examples-add-config-variable-to-enable-disable-dpdk_.patch deleted file mode 100644 index c86c1a1d..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-examples-add-config-variable-to-enable-disable-dpdk_.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 54c95ca8f76f412c94a9f61e3756420ac554310b Mon Sep 17 00:00:00 2001 -From: Ong Boon Leong -Date: Thu, 12 Feb 2015 16:33:49 +0800 -Subject: [PATCH] examples: add config variable to enable/disable dpdk_qat - -Upstream-Status: Inappropriate [configuration] - -This patch adss following example build configs: - -1) CONFIG_EXAMPLE_DPDK_QAT is used to control dpdk_qat example - by PACKAGECONFIG. - -2) CONFIG_EXAMPLE_VM_POWER_MANAGER is used to control vm_power_manager - example by PACKAGECONFIG. - -Signed-off-by: Ong Boon Leong ---- - examples/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/examples/Makefile b/examples/Makefile -index 81f1d2f..7e9c7bd 100644 ---- a/examples/Makefile -+++ b/examples/Makefile -@@ -40,7 +40,7 @@ include $(RTE_SDK)/mk/rte.vars.mk - DIRS-y += cmdline - DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor - ifneq ($(ICP_ROOT),) --DIRS-y += dpdk_qat -+DIRS-$(CONFIG_EXAMPLE_DPDK_QAT) += dpdk_qat - endif - DIRS-y += exception_path - DIRS-y += helloworld -@@ -68,6 +68,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost - DIRS-$(CONFIG_RTE_LIBRTE_XEN_DOM0) += vhost_xen - DIRS-y += vmdq - DIRS-y += vmdq_dcb --DIRS-y += vm_power_manager -+DIRS-$(CONFIG_EXAMPLE_VM_POWER_MANAGER) += vm_power_manager - - include $(RTE_SDK)/mk/rte.extsubdir.mk --- -1.7.9.5 - diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb b/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb index cab76cc4..5265a9cf 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb +++ b/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb @@ -1,11 +1,11 @@ include dpdk.inc SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ - file://dpdk-1.8.0-examples-add-config-variable-to-enable-disable-dpdk_.patch \ file://dpdk-1.8.0-dpdk-enable-build-config-VHOST-in-common_linuxapp-config.patch \ - file://dpdk-1.8.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ - file://dpdk-1.8.0-add-sysroot-option-within-app-makefile.patch \ - file://dpdk-1.8.0-dpdk-defconfig-select-RTE_MACHINE-type.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" -- cgit v1.2.3-54-g00ecf