Attachment 159979 Details for Bug 202415 – Patch file with changes to update DPDK port to 2.1 release

[patch] Patch file with changes to update DPDK port to 2.1 release

0001-Update-to-2.1.patch (text/plain), 9.14 KB, created by Bruce Richardson on 2015-08-18 13:10:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bruce Richardson

Created: 2015-08-18 13:10:16 UTC

Size: 9.14 KB

patch

obsolete

>From 9d79caa8ffe5a2e5acbb58fa68c840119935244f Mon Sep 17 00:00:00 2001
>From: Bruce Richardson <bruce.richardson@intel.com>
>Date: Thu, 13 Aug 2015 15:35:57 +0100
>Subject: [PATCH] Update to 2.1
>
>---
> Makefile                                   |  2 +-
> distinfo                                   |  4 +-
> files/patch-mk_exec-env_bsdapp_rte.vars.mk |  4 +-
> pkg-plist                                  | 67 +++++++++++++++++++++++-------
> 4 files changed, 58 insertions(+), 19 deletions(-)
>
>diff --git a/Makefile b/Makefile
>index 4a1d4e0..6f85f2f 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/net/dpdk/Makefile 384356 2015-04-20 12:49:20Z vanilla $
> 
> PORTNAME=	dpdk
>-PORTVERSION=	2.0.0
>+PORTVERSION=	2.1.0
> CATEGORIES=	net
> MASTER_SITES=	http://www.dpdk.org/browse/dpdk/snapshot/
> 
>diff --git a/distinfo b/distinfo
>index 7179722..2cef05d 100644
>--- a/distinfo
>+++ b/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (dpdk-2.0.0.tar.gz) = 643789a3be5ba44dd84d6b248cdf5471b260f8736dada177dadf076aebfbff3f
>-SIZE (dpdk-2.0.0.tar.gz) = 14960022
>+SHA256 (dpdk-2.1.0.tar.gz) = f7b322867a45f99afd9c8fbacdc56e1621676f9ca0f046656ec85eb6a99a3440
>+SIZE (dpdk-2.1.0.tar.gz) = 15561567
>diff --git a/files/patch-mk_exec-env_bsdapp_rte.vars.mk b/files/patch-mk_exec-env_bsdapp_rte.vars.mk
>index 17b44cf..a4b69c5 100644
>--- a/files/patch-mk_exec-env_bsdapp_rte.vars.mk
>+++ b/files/patch-mk_exec-env_bsdapp_rte.vars.mk
>@@ -3,7 +3,7 @@
> @@ -40,13 +40,13 @@
>  # examples for RTE_EXEC_ENV: linuxapp, bsdapp
>  #
>- ifeq ($(RTE_BUILD_SHARED_LIB),y)
>+ ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
> -EXECENV_CFLAGS  = -pthread -fPIC
> +EXECENV_CFLAGS  = -pthread -fPIC %%EXECINFO_CPPFLAGS%%
>  else
>@@ -16,4 +16,4 @@
> +EXECENV_LDLIBS  = -lexecinfo %%EXECINFO_LDFLAGS%%
>  EXECENV_ASFLAGS =
>  
>- ifeq ($(RTE_BUILD_SHARED_LIB),y)
>+ ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
>diff --git a/pkg-plist b/pkg-plist
>index 6400541..0f66da6 100644
>--- a/pkg-plist
>+++ b/pkg-plist
>@@ -29,21 +29,46 @@ lib/dpdk
> %%DATADIR%%/examples/ip_fragmentation/Makefile
> %%DATADIR%%/examples/ip_fragmentation/main.c
> %%DATADIR%%/examples/ip_pipeline/Makefile
>-%%DATADIR%%/examples/ip_pipeline/cmdline.c
>-%%DATADIR%%/examples/ip_pipeline/config.c
>+%%DATADIR%%/examples/ip_pipeline/app.h
>+%%DATADIR%%/examples/ip_pipeline/config/ip_pipeline.cfg
>+%%DATADIR%%/examples/ip_pipeline/config/ip_pipeline.sh
>+%%DATADIR%%/examples/ip_pipeline/config/tm_profile.cfg
>+%%DATADIR%%/examples/ip_pipeline/config_check.c
>+%%DATADIR%%/examples/ip_pipeline/config_parse.c
>+%%DATADIR%%/examples/ip_pipeline/config_parse_tm.c
>+%%DATADIR%%/examples/ip_pipeline/cpu_core_map.c
>+%%DATADIR%%/examples/ip_pipeline/cpu_core_map.h
> %%DATADIR%%/examples/ip_pipeline/init.c
>-%%DATADIR%%/examples/ip_pipeline/ip_pipeline.cfg
>-%%DATADIR%%/examples/ip_pipeline/ip_pipeline.sh
> %%DATADIR%%/examples/ip_pipeline/main.c
>-%%DATADIR%%/examples/ip_pipeline/main.h
>-%%DATADIR%%/examples/ip_pipeline/pipeline_firewall.c
>-%%DATADIR%%/examples/ip_pipeline/pipeline_flow_classification.c
>-%%DATADIR%%/examples/ip_pipeline/pipeline_ipv4_frag.c
>-%%DATADIR%%/examples/ip_pipeline/pipeline_ipv4_ras.c
>-%%DATADIR%%/examples/ip_pipeline/pipeline_passthrough.c
>-%%DATADIR%%/examples/ip_pipeline/pipeline_routing.c
>-%%DATADIR%%/examples/ip_pipeline/pipeline_rx.c
>-%%DATADIR%%/examples/ip_pipeline/pipeline_tx.c
>+%%DATADIR%%/examples/ip_pipeline/pipeline.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/hash_func.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_actions_common.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_common_be.c
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_common_be.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_common_fe.c
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_common_fe.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_firewall.c
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_firewall.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_firewall_be.c
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_firewall_be.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_flow_classification.c
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_flow_classification.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_master.c
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_master.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_master_be.c
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_master_be.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_passthrough.c
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_passthrough.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_passthrough_be.c
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_passthrough_be.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_routing.c
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_routing.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_routing_be.c
>+%%DATADIR%%/examples/ip_pipeline/pipeline/pipeline_routing_be.h
>+%%DATADIR%%/examples/ip_pipeline/pipeline_be.h
>+%%DATADIR%%/examples/ip_pipeline/thread.c
> %%DATADIR%%/examples/ip_reassembly/Makefile
> %%DATADIR%%/examples/ip_reassembly/main.c
> %%DATADIR%%/examples/ipv4_multicast/Makefile
>@@ -141,6 +166,13 @@ lib/dpdk
> %%DATADIR%%/examples/rxtx_callbacks/main.c
> %%DATADIR%%/examples/skeleton/Makefile
> %%DATADIR%%/examples/skeleton/basicfwd.c
>+%%DATADIR%%/examples/tep_termination/Makefile
>+%%DATADIR%%/examples/tep_termination/main.c
>+%%DATADIR%%/examples/tep_termination/main.h
>+%%DATADIR%%/examples/tep_termination/vxlan.c
>+%%DATADIR%%/examples/tep_termination/vxlan.h
>+%%DATADIR%%/examples/tep_termination/vxlan_setup.c
>+%%DATADIR%%/examples/tep_termination/vxlan_setup.h
> %%DATADIR%%/examples/timer/Makefile
> %%DATADIR%%/examples/timer/main.c
> %%DATADIR%%/examples/vhost/Makefile
>@@ -173,6 +205,7 @@ lib/dpdk
> %%DATADIR%%/examples/vmdq_dcb/main.c
> %%DATADIR%%/mk/arch/i686/rte.vars.mk
> %%DATADIR%%/mk/arch/ppc_64/rte.vars.mk
>+%%DATADIR%%/mk/arch/tile/rte.vars.mk
> %%DATADIR%%/mk/arch/x86_64/rte.vars.mk
> %%DATADIR%%/mk/arch/x86_x32/rte.vars.mk
> %%DATADIR%%/mk/exec-env/bsdapp/rte.app.mk
>@@ -198,6 +231,7 @@ lib/dpdk
> %%DATADIR%%/mk/machine/nhm/rte.vars.mk
> %%DATADIR%%/mk/machine/power8/rte.vars.mk
> %%DATADIR%%/mk/machine/snb/rte.vars.mk
>+%%DATADIR%%/mk/machine/tilegx/rte.vars.mk
> %%DATADIR%%/mk/machine/wsm/rte.vars.mk
> %%DATADIR%%/mk/rte.app.mk
> %%DATADIR%%/mk/rte.bsdmodule.mk
>@@ -248,6 +282,7 @@ lib/dpdk
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_cycles.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_memcpy.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_prefetch.h
>+%%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_rwlock.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_spinlock.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/cmdline.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/cmdline_cirbuf.h
>@@ -282,6 +317,7 @@ lib/dpdk
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_cycles.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_debug.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_dev.h
>+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_dev_info.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_devargs.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_distributor.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_eal.h
>@@ -336,6 +372,7 @@ lib/dpdk
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_red.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_reorder.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_ring.h
>+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_rtm.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_rwlock.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_sched.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_sched_common.h
>@@ -351,6 +388,7 @@ lib/dpdk
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_table_stub.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_tailq.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_tcp.h
>+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_thash.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_timer.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_udp.h
> %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_vect.h
>@@ -372,6 +410,7 @@ lib/dpdk
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_meter.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pipeline.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_bond.a
>+%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_cxgbe.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_e1000.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_enic.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_fm10k.a
>@@ -380,7 +419,7 @@ lib/dpdk
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_null.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_pcap.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_ring.a
>-%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_virtio_uio.a
>+%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_virtio.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_vmxnet3_uio.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_port.a
> %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_reorder.a
>-- 
>2.4.6
>

Actions: View | Diff

Attachments on bug 202415: 159979