[dpdk-stable] patch 'build: create relative symlinks for PMDs in libdir' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/23/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 520f1e2d9cd6c6b17e9bcd8f8beed907b3746746 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca at debian.org>
Date: Wed, 12 Sep 2018 18:21:34 +0100
Subject: [PATCH] build: create relative symlinks for PMDs in libdir

[ upstream commit 983f08969656128bc64a36ce70de6cb44e7bd070 ]

Add -r option to ln, otherwise the link will be absolute and contain
the build path and break packaging among other things:

lrwxrwxrwx 1 bluca bluca     99 Sep 11 22:17 librte_mempool_dpaa.so.1.1
  -> /home/bluca/git/dpdk/testt4//usr/local/lib/x86_64-linux-gnu/dpdk/
     drivers/librte_mempool_dpaa.so.1.1

With -r:

lrwxrwxrwx 1 bluca bluca     35 Sep 12 18:13 librte_pmd_zlib.so.1.1
  -> dpdk/drivers/librte_pmd_zlib.so.1.1

Fixes: ed4d43d73e2b ("build: symlink drivers to library directory")

Signed-off-by: Luca Boccassi <bluca at debian.org>
Tested-by: Timothy Redaelli <tredaelli at redhat.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 buildtools/symlink-drivers-solibs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildtools/symlink-drivers-solibs.sh b/buildtools/symlink-drivers-solibs.sh
index 803dfec49..9826c6ae3 100644
--- a/buildtools/symlink-drivers-solibs.sh
+++ b/buildtools/symlink-drivers-solibs.sh
@@ -10,3 +10,3 @@
 # 1. directory containing driver files e.g. lib64/dpdk/drivers
 # 2. directory for installed regular libs e.g. lib64
-ln -sf ${DESTDIR}/${MESON_INSTALL_PREFIX}/$1/* ${DESTDIR}/${MESON_INSTALL_PREFIX}/$2
+ln -rsf ${DESTDIR}/${MESON_INSTALL_PREFIX}/$1/* ${DESTDIR}/${MESON_INSTALL_PREFIX}/$2
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-20 17:53:08.464445439 +0000
+++ 0042-build-create-relative-symlinks-for-PMDs-in-libdir.patch	2018-11-20 17:53:07.000000000 +0000
@@ -1,8 +1,10 @@
-From 983f08969656128bc64a36ce70de6cb44e7bd070 Mon Sep 17 00:00:00 2001
+From 520f1e2d9cd6c6b17e9bcd8f8beed907b3746746 Mon Sep 17 00:00:00 2001
 From: Luca Boccassi <bluca at debian.org>
 Date: Wed, 12 Sep 2018 18:21:34 +0100
 Subject: [PATCH] build: create relative symlinks for PMDs in libdir
 
+[ upstream commit 983f08969656128bc64a36ce70de6cb44e7bd070 ]
+
 Add -r option to ln, otherwise the link will be absolute and contain
 the build path and break packaging among other things:
 
@@ -16,7 +18,6 @@
   -> dpdk/drivers/librte_pmd_zlib.so.1.1
 
 Fixes: ed4d43d73e2b ("build: symlink drivers to library directory")
-Cc: stable at dpdk.org
 
 Signed-off-by: Luca Boccassi <bluca at debian.org>
 Tested-by: Timothy Redaelli <tredaelli at redhat.com>