[yocto] [meta-security][PATCH] keyutils: fix library install path

[Martin Jansa]

When you're on it, can you please check if it works with multilib?

I think $(USRLIBDIR) doesn't respect ${libdir} from OE, so it always
installs the library to /usr/lib instead of e.g. /usr/lib64 with multlilib.

e.g. recipes-security/ccs-tools/ccs-tools_1.8.4.bb is
setting USRLIBDIR=${libdir}, I guess keyutils needs the same.

On Fri, May 17, 2019 at 6:46 PM Armin Kuster <akuster808 at gmail.com> wrote:

> Signed-off-by: Armin Kuster <akuster808 at gmail.com>
> ---
>  .../files/fix_library_install_path.patch      | 28 +++++++++++++++++++
>  recipes-security/keyutils/keyutils_1.6.bb     |  1 +
>  2 files changed, 29 insertions(+)
>  create mode 100644
> recipes-security/keyutils/files/fix_library_install_path.patch
>
> diff --git
> a/recipes-security/keyutils/files/fix_library_install_path.patch
> b/recipes-security/keyutils/files/fix_library_install_path.patch
> new file mode 100644
> index 0000000..938fe2e
> --- /dev/null
> +++ b/recipes-security/keyutils/files/fix_library_install_path.patch
> @@ -0,0 +1,28 @@
> +From b0355cc205543ffd33752874295139d57c4fbc3e Mon Sep 17 00:00:00 2001
> +From: Wenzong Fan <wenzong.fan at windriver.com>
> +Date: Tue, 26 Sep 2017 07:59:51 +0000
> +Subject: [PATCH] Subject: [PATCH] keyutils: use relative path for link
> +
> +The absolute path of the symlink will be invalid
> +when populated in sysroot, so use relative path instead.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
> +Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
> +{rebased for 1.6]
> +Signed-off-by: Armin Kuster <akuster808 at gmail.com>
> +
> +Index: keyutils-1.6/Makefile
> +===================================================================
> +--- keyutils-1.6.orig/Makefile
> ++++ keyutils-1.6/Makefile
> +@@ -184,7 +184,7 @@ ifeq ($(NO_SOLIB),0)
> +       $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
> +       $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
> +       mkdir -p $(DESTDIR)$(USRLIBDIR)
> +-      $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
> ++      $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
> +       sed \
> +       -e 's, at VERSION\@,$(VERSION),g' \
> +       -e 's, at prefix\@,$(PREFIX),g' \
> diff --git a/recipes-security/keyutils/keyutils_1.6.bb
> b/recipes-security/keyutils/keyutils_1.6.bb
> index c961fa2..2968a24 100644
> --- a/recipes-security/keyutils/keyutils_1.6.bb
> +++ b/recipes-security/keyutils/keyutils_1.6.bb
> @@ -19,6 +19,7 @@ SRC_URI = "
> http://people.redhat.com/dhowells/keyutils/${BP}.tar.bz2 \
>             file://keyutils-test-fix-output-format.patch \
>
> file://keyutils-fix-error-report-by-adding-default-message.patch \
>             file://run-ptest \
> +           file://fix_library_install_path.patch \
>             "
>
>  SRC_URI[md5sum] = "191987b0ab46bb5b50efd70a6e6ce808"
> --
> 2.17.1
>
> --
> _______________________________________________
> yocto mailing list
> yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20190517/8ecc731f/attachment.html>