xfs
[Top] [All Lists]

Re: symlink loop for /lib64/libhandle.so

To: Jan ??ul??k <jan@xxxxxxxx>, Dave Chinner <dchinner@xxxxxxxxxx>
Subject: Re: symlink loop for /lib64/libhandle.so
From: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Mon, 11 Aug 2014 11:02:27 -0700
Cc: Brian Foster <bfoster@xxxxxxxxxx>, Eric Sandeen <sandeen@xxxxxxxxxxx>, XFS mail list <xfs@xxxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <20140715154857.GA14716@xxxxxxxxxxxxx>
References: <1404898212.7231.12.camel@jtulak> <20140709132836.GA65226@xxxxxxxxxxxxxxx> <20140710134851.GA26652@xxxxxxxxxxxxx> <1405009872.31068.22.camel@jtulak> <53BEC1E7.1070904@xxxxxxxxxxx> <1405075678.28203.56.camel@jtulak> <1405325087.3196.6.camel@jtulak> <20140714082607.GA19882@xxxxxxxxxxxxx> <CAO78W=0Y-ja8U6ntkKHdOaXBhR5P4Ec8i+0ic3vTqZ5AugwP9A@xxxxxxxxxxxxxx> <20140715154857.GA14716@xxxxxxxxxxxxx>
User-agent: Mutt/1.5.23 (2014-03-12)
Dave, can you pick up this patch for xfsprogs?

On Tue, Jul 15, 2014 at 08:48:57AM -0700, Christoph Hellwig wrote:
> Hi Jan,
> 
> there were still some small isues with the patch format, I've attached
> a version of your patch that has the expected format.
> 
> Note that I also changed it to only check the canonical names instead of
> testing the passed in one and the one readlink was called on.  This
> should be enough I think, but please test that it still works for you.
> 
> Thanks for tracking this down!

> From: Jan Tulak <jan@xxxxxxxx>
> Subject: [PATCH] libhandle: fix instalation for symlinked /usr
> 
> Canonicalize the pathnames for PKG_LIB_DIR and PKG_ROOT_LIB_DIR before
> checking if they are the same.  This is required for Fedora which doesn't
> have a separate /usr/lib directory anymore.
> 
> Reported-by: Jan Tulak <jan@xxxxxxxx>
> Signed-off-by: Jan Tulak <jan@xxxxxxxx>
> 
> diff --git a/include/buildmacros b/include/buildmacros
> index 7a01880..4e4e8fa 100644
> --- a/include/buildmacros
> +++ b/include/buildmacros
> @@ -76,10 +76,11 @@ INSTALL_LTLIB_DEV = \
>       ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
>       ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
>       ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
> -     if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \
> -     ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a 
> $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
> -     ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la 
> $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
> -     ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so 
> $(PKG_LIB_DIR)/$(LIBNAME).so; \
> +     if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
> +          "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))"; ]; then \
> +             ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a 
> $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
> +             ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la 
> $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
> +             ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so 
> $(PKG_LIB_DIR)/$(LIBNAME).so; \
>       fi
>  else
>  INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)

> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs

---end quoted text---

<Prev in Thread] Current Thread [Next in Thread>
  • Re: symlink loop for /lib64/libhandle.so, Christoph Hellwig <=