From 2e01579e9544640f627ef74e2da295e61ddf0da3 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Tue, 19 Jul 2016 08:58:41 -0300 Subject: Removing old patches, not used anymore Patches: - debian/patches/ubuntu-backport-44-linking-cleanup.patch - debian/patches/ubuntu-fix-xenvirt-support-dynamic-page-size.patch Change-Id: I2edf454da801bf726866aa5cb85965396f5d3a04 Signed-off-by: Ricardo Salveti --- .../ubuntu-backport-44-linking-cleanup.patch | 61 ---------------------- ...ntu-fix-xenvirt-support-dynamic-page-size.patch | 32 ------------ 2 files changed, 93 deletions(-) delete mode 100644 debian/patches/ubuntu-backport-44-linking-cleanup.patch delete mode 100644 debian/patches/ubuntu-fix-xenvirt-support-dynamic-page-size.patch diff --git a/debian/patches/ubuntu-backport-44-linking-cleanup.patch b/debian/patches/ubuntu-backport-44-linking-cleanup.patch deleted file mode 100644 index 88fc612d..00000000 --- a/debian/patches/ubuntu-backport-44-linking-cleanup.patch +++ /dev/null @@ -1,61 +0,0 @@ -Description: backport of dpdk 16.07 fixes for library linking - -This is a merge of related upstream discussions: -- [PATCH 1/3] mk: fix librte_pipeline dependency list truncation -- [PATCH 3/3] mk: fail build on incomplete shared library dependencies - -Forwarded: yes (likely in DPDK 16.07 in some way) -Author: Christian Ehrhardt -Last-Update: 2016-06-23 -Index: deb_dpdk/lib/librte_pipeline/Makefile -=================================================================== ---- deb_dpdk.orig/lib/librte_pipeline/Makefile -+++ deb_dpdk/lib/librte_pipeline/Makefile -@@ -53,7 +53,7 @@ SYMLINK-$(CONFIG_RTE_LIBRTE_PIPELINE)-in - - # this lib depends upon: - DEPDIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += lib/librte_eal --DEPDIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) := lib/librte_table -+DEPDIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += lib/librte_table - DEPDIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += lib/librte_port - - include $(RTE_SDK)/mk/rte.lib.mk -Index: deb_dpdk/lib/librte_port/Makefile -=================================================================== ---- deb_dpdk.orig/lib/librte_port/Makefile -+++ deb_dpdk/lib/librte_port/Makefile -@@ -70,7 +70,7 @@ SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-includ - SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_source_sink.h - - # this lib depends upon: --DEPDIRS-$(CONFIG_RTE_LIBRTE_PORT) := lib/librte_eal -+DEPDIRS-$(CONFIG_RTE_LIBRTE_PORT) += lib/librte_eal - DEPDIRS-$(CONFIG_RTE_LIBRTE_PORT) += lib/librte_mbuf - DEPDIRS-$(CONFIG_RTE_LIBRTE_PORT) += lib/librte_mempool - DEPDIRS-$(CONFIG_RTE_LIBRTE_PORT) += lib/librte_ether -Index: deb_dpdk/lib/librte_table/Makefile -=================================================================== ---- deb_dpdk.orig/lib/librte_table/Makefile -+++ deb_dpdk/lib/librte_table/Makefile -@@ -72,7 +72,7 @@ SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-inclu - SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_stub.h - - # this lib depends upon: --DEPDIRS-$(CONFIG_RTE_LIBRTE_TABLE) := lib/librte_eal -+DEPDIRS-$(CONFIG_RTE_LIBRTE_TABLE) += lib/librte_eal - DEPDIRS-$(CONFIG_RTE_LIBRTE_TABLE) += lib/librte_mbuf - DEPDIRS-$(CONFIG_RTE_LIBRTE_TABLE) += lib/librte_mempool - DEPDIRS-$(CONFIG_RTE_LIBRTE_TABLE) += lib/librte_port -Index: deb_dpdk/mk/rte.lib.mk -=================================================================== ---- deb_dpdk.orig/mk/rte.lib.mk -+++ deb_dpdk/mk/rte.lib.mk -@@ -94,7 +94,7 @@ O_TO_A_DO = @set -e; \ - echo $(O_TO_A_CMD) > $(call exe2cmd,$(@)) - - O_TO_S = $(LD) -L$(RTE_OUTPUT)/lib $(_CPU_LDFLAGS) $(EXTRA_LDFLAGS) \ -- -shared $(OBJS-y) $(LDLIBS) -Wl,-soname,$(LIB) -o $(LIB) -+ -shared $(OBJS-y) -z defs $(LDLIBS) -Wl,-soname,$(LIB) -o $(LIB) - O_TO_S_STR = $(subst ','\'',$(O_TO_S)) #'# fix syntax highlight - O_TO_S_DISP = $(if $(V),"$(O_TO_S_STR)"," LD $(@)") - O_TO_S_DO = @set -e; \ diff --git a/debian/patches/ubuntu-fix-xenvirt-support-dynamic-page-size.patch b/debian/patches/ubuntu-fix-xenvirt-support-dynamic-page-size.patch deleted file mode 100644 index ed6fb5d0..00000000 --- a/debian/patches/ubuntu-fix-xenvirt-support-dynamic-page-size.patch +++ /dev/null @@ -1,32 +0,0 @@ -Author: Ricardo Salveti -Last-Update: 2016-04-17 -Fowarded: yes -Description: xenvirt: support dynamic page size - -Fix build failure since PAGE_SIZE is not defined on ARM (multiple values -are possible, so it needs to dynamically get the page size used). - -http://dpdk.org/ml/archives/dev/2016-April/037586.html - -Signed-off-by: Ricardo Salveti ---- - drivers/net/xenvirt/rte_eth_xenvirt.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/net/xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c -index b9638d9..afc0193 100644 ---- a/drivers/net/xenvirt/rte_eth_xenvirt.c -+++ b/drivers/net/xenvirt/rte_eth_xenvirt.c -@@ -39,6 +39,9 @@ - #include - #include - #include -+#ifndef PAGE_SIZE -+#define PAGE_SIZE sysconf(_SC_PAGE_SIZE) -+#endif - #include - #include - #if __XEN_LATEST_INTERFACE_VERSION__ < 0x00040200 --- -2.7.4 - -- cgit 1.2.3-korg