[dpdk-stable] patch 'mk: remove library search path from binary' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/21/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 7da96b000ea54eaf435b9aa8f3c000877add9009 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Fri, 22 Nov 2019 11:30:23 +0000
Subject: [PATCH] mk: remove library search path from binary

[ upstream commit 6b01864cc9c59a731dbc727a96995fd2b2ff452f ]

This patch functionally reverts the patch in fixes line to not have any
hardcoded library path in the final binary for the security reasons, in
case this binary distributed to production environment.

RPATH only added in RTE_DEVEL_BUILD case and this binary shouldn't
distributed, but still removing it to be cautious.

Fixes: 8919f73bcbaa ("mk: add build directory to library search path")

Suggested-by: Bruce Richardson <bruce.richardson at intel.com>
Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 mk/rte.app.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index 6a6a7452e2..4a03e83141 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -248,10 +248,6 @@ filter-libs = \
 
 LDLIBS := $(call filter-libs,$(LDLIBS))
 
-ifeq ($(RTE_DEVEL_BUILD)$(CONFIG_RTE_BUILD_SHARED_LIB),yy)
-LDFLAGS += -rpath=$(RTE_SDK_BIN)/lib
-endif
-
 MAPFLAGS = -Map=$@.map --cref
 
 .PHONY: all
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:31.495650132 +0000
+++ 0130-mk-remove-library-search-path-from-binary.patch	2019-12-19 14:32:26.337302426 +0000
@@ -1,8 +1,10 @@
-From 6b01864cc9c59a731dbc727a96995fd2b2ff452f Mon Sep 17 00:00:00 2001
+From 7da96b000ea54eaf435b9aa8f3c000877add9009 Mon Sep 17 00:00:00 2001
 From: Ferruh Yigit <ferruh.yigit at intel.com>
 Date: Fri, 22 Nov 2019 11:30:23 +0000
 Subject: [PATCH] mk: remove library search path from binary
 
+[ upstream commit 6b01864cc9c59a731dbc727a96995fd2b2ff452f ]
+
 This patch functionally reverts the patch in fixes line to not have any
 hardcoded library path in the final binary for the security reasons, in
 case this binary distributed to production environment.
@@ -11,40 +13,18 @@
 distributed, but still removing it to be cautious.
 
 Fixes: 8919f73bcbaa ("mk: add build directory to library search path")
-Cc: stable at dpdk.org
 
 Suggested-by: Bruce Richardson <bruce.richardson at intel.com>
 Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---
- devtools/test-null.sh | 2 ++
- mk/rte.app.mk         | 4 ----
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/devtools/test-null.sh b/devtools/test-null.sh
-index d82c6ad193..72aa82b16f 100755
---- a/devtools/test-null.sh
-+++ b/devtools/test-null.sh
-@@ -11,6 +11,7 @@ coremask=${2:-3} # default using cores 0 and 1
- eal_options=$3
- testpmd_options=$4
- 
-+[ -f "$testpmd" ] && build=$(dirname $(dirname $testpmd))
- [ -f "$testpmd" ] || testpmd=$build/app/dpdk-testpmd
- [ -f "$testpmd" ] || testpmd=$build/app/testpmd
- if [ ! -f "$testpmd" ] ; then
-@@ -19,6 +20,7 @@ if [ ! -f "$testpmd" ] ; then
- fi
- 
- if ldd $testpmd | grep -q librte_ ; then
-+	export LD_LIBRARY_PATH=$build/lib:$LD_LIBRARY_PATH
- 	libs='-d librte_mempool_ring.so -d librte_pmd_null.so'
- else
- 	libs=
+ mk/rte.app.mk | 4 ----
+ 1 file changed, 4 deletions(-)
+
 diff --git a/mk/rte.app.mk b/mk/rte.app.mk
-index a278552c62..05ea034b99 100644
+index 6a6a7452e2..4a03e83141 100644
 --- a/mk/rte.app.mk
 +++ b/mk/rte.app.mk
-@@ -379,10 +379,6 @@ filter-libs = \
+@@ -248,10 +248,6 @@ filter-libs = \
  
  LDLIBS := $(call filter-libs,$(LDLIBS))