aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Ehrhardt <christian.ehrhardt@canonical.com>2016-12-08 16:48:04 +0100
committerChristian Ehrhardt <christian.ehrhardt@canonical.com>2016-12-12 15:41:58 +0100
commitd50dc4314500151068d5fab00768f9f1e2c6a59a (patch)
tree488f6ebad48a7c3c131fd992616726a5e75c2b6b
parent50bef32e58aa28cffda4f3c7889521dbc19cf028 (diff)
Drop d/p/rte-devel-build-env.patch (is upstream)
Change-Id: I97f2333912d444f5bd797a03d58913d070f399f0 Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-rw-r--r--debian/patches/rte-devel-build-env.patch37
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 38 deletions
diff --git a/debian/patches/rte-devel-build-env.patch b/debian/patches/rte-devel-build-env.patch
deleted file mode 100644
index a44885b0..00000000
--- a/debian/patches/rte-devel-build-env.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5a75a37716f69905af29fbd81aef44625eb69a8b Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <lboccass@brocade.com>
-Date: Wed, 14 Sep 2016 11:47:06 +0100
-Subject: [PATCH] mk: use ?= instead of := for RTE_DEVEL_BUILD
-
-RTE_DEVEL_BUILD is set to := y in mk/rte.vars.mk, which makes it
-impossible to override via an environment variable, and forces users
-to pass it inline in the make call.
-Use ?= instead to have it pick up the environment variable as well.
-
-Cc: <stable@dpdk.org>
-Signed-off-by: Luca Boccassi <lboccass@brocade.com>
-
-Forwarded: yes
-Origin: Upstream, http://dpdk.org/dev/patchwork/patch/15795/
-Author: Luca Boccassi <lboccass@brocade.com>
-Last-Update: 2016-09-14
----
- mk/rte.vars.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk
-index 28982a5..21ee0ca 100644
---- a/mk/rte.vars.mk
-+++ b/mk/rte.vars.mk
-@@ -104,7 +104,7 @@ export RTE_TOOLCHAIN
-
- # developer build automatically enabled in a git tree
- ifneq ($(wildcard $(RTE_SDK)/.git),)
--RTE_DEVEL_BUILD := y
-+RTE_DEVEL_BUILD ?= y
- endif
-
- # SRCDIR is the current source directory
---
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 93da9837..63250351 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
fix-vhost-user-socket-permission.patch
fix-power-default-config.patch
-rte-devel-build-env.patch
dpdk-dev-v2-1-4-doc-move-tool-guides-in-their-own-subdirectory.patch
dpdk-dev-v2-2-4-doc-rendering-and-installation-of-man-pages.patch
dpdk-dev-v2-3-4-doc-add-basic-invocation-info-for-dpdk-pmdinfo.patch