build: create relative symlinks for PMDs in libdir

Message ID 20180912172134.21099-1-bluca@debian.org (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series build: create relative symlinks for PMDs in libdir |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Luca Boccassi Sept. 12, 2018, 5:21 p.m. UTC
  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")
Cc: stable@dpdk.org

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 buildtools/symlink-drivers-solibs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Timothy Redaelli Sept. 12, 2018, 5:39 p.m. UTC | #1
On Wed, 12 Sep 2018 18:21:34 +0100
Luca Boccassi <bluca@debian.org> wrote:

> 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")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>

Tested on Fedora 28 by building dpdk using meson from a spec file

Tested-by: Timothy Redaelli <tredaelli@redhat.com>
  
Bruce Richardson Sept. 13, 2018, 9:11 a.m. UTC | #2
On Wed, Sep 12, 2018 at 06:21:34PM +0100, Luca Boccassi wrote:
> 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")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>
> ---
>  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 803dfec491..9826c6ae37 100644
> --- a/buildtools/symlink-drivers-solibs.sh
> +++ b/buildtools/symlink-drivers-solibs.sh
> @@ -9,4 +9,4 @@
>  # parameters to script are paths relative to install prefix:
>  # 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
> -- 

Acked-by: Bruce Richardson <bruce.richardson@intel.com>
  
Thomas Monjalon Sept. 17, 2018, 11:38 a.m. UTC | #3
13/09/2018 11:11, Bruce Richardson:
> On Wed, Sep 12, 2018 at 06:21:34PM +0100, Luca Boccassi wrote:
> > 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")
> > Cc: stable@dpdk.org
> > 
> > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > ---
> >  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 803dfec491..9826c6ae37 100644
> > --- a/buildtools/symlink-drivers-solibs.sh
> > +++ b/buildtools/symlink-drivers-solibs.sh
> > @@ -9,4 +9,4 @@
> >  # parameters to script are paths relative to install prefix:
> >  # 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
> 
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Applied, thanks
  

Patch

diff --git a/buildtools/symlink-drivers-solibs.sh b/buildtools/symlink-drivers-solibs.sh
index 803dfec491..9826c6ae37 100644
--- a/buildtools/symlink-drivers-solibs.sh
+++ b/buildtools/symlink-drivers-solibs.sh
@@ -9,4 +9,4 @@ 
 # parameters to script are paths relative to install prefix:
 # 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