Skip to contentSkip to conversation

keyutils: fix library install path

PATCH Superseded Armin Kuster 2 participants 3 messages May 17, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 keyutils: fix library install path

---
 .../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
recipes-security/keyutils/files/fix_library_install_path.patch new file +28 -0
new file mode 100644
index 0000000..938fe2e
@@ -0,0 +1,28 @@
+From b0355cc205543ffd33752874295139d57c4fbc3e Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <[email protected]>
+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 <[email protected]>
+Signed-off-by: Wenzong Fan <[email protected]>
+{rebased for 1.6]
+Signed-off-by: Armin Kuster <[email protected]>
+
+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,@VERSION\@,$(VERSION),g' \
+ 	-e 's,@prefix\@,$(PREFIX),g' \
recipes-security/keyutils/keyutils_1.6.bb +1 -0
index c961fa2..2968a24 100644
@@ -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"
Signature · 1 line
2.17.1
#1 lore raw

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.

Quoted 68 lines · Armin Kuster
---
 .../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

recipes-security/keyutils/files/fix_library_install_path.patch new file +28 -0
@@ -0,0 +1,28 @@
+From b0355cc205543ffd33752874295139d57c4fbc3e Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <[email protected]>
+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 <[email protected]>
+Signed-off-by: Wenzong Fan <[email protected]>
+{rebased for 1.6]
+Signed-off-by: Armin Kuster <[email protected]>
+
+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,@VERSION\@,$(VERSION),g' \
+       -e 's,@prefix\@,$(PREFIX),g' \
recipes-security/keyutils/keyutils_1.6.bb +1 -0
index c961fa2..2968a24 100644
@@ -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
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

author
#2 lore raw
Quoted 5 lines · 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.

Thank,

Will do.

- armin

Quoted 90 lines

e.g. recipes-security/ccs-tools/ccs-tools_1.8.4.bb
<http://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 <[email protected] <mailto:[email protected]>> wrote:

    Signed-off-by: Armin Kuster <[email protected]
    <mailto:[email protected]>>
    ---
     .../files/fix_library_install_path.patch      | 28
    +++++++++++++++++++
     recipes-security/keyutils/keyutils_1.6.bb
    <http://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 <[email protected]
    <mailto:[email protected]>>
    +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 <[email protected]
    <mailto:[email protected]>>
    +Signed-off-by: Wenzong Fan <[email protected]
    <mailto:[email protected]>>
    +{rebased for 1.6]
    +Signed-off-by: Armin Kuster <[email protected]
    <mailto:[email protected]>>
    +
    +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,@VERSION\@,$(VERSION),g' \
    +       -e 's,@prefix\@,$(PREFIX),g' \
    diff --git a/recipes-security/keyutils/keyutils_1.6.bb
    <http://keyutils_1.6.bb>
    b/recipes-security/keyutils/keyutils_1.6.bb <http://keyutils_1.6.bb>
    index c961fa2..2968a24 100644
    --- a/recipes-security/keyutils/keyutils_1.6.bb
    <http://keyutils_1.6.bb>
    +++ b/recipes-security/keyutils/keyutils_1.6.bb
    <http://keyutils_1.6.bb>
    @@ -19,6 +19,7 @@ SRC_URI =
    "http://people.redhat.com/dhowells/keyutils/${BP}.tar.bz2
    <http://people.redhat.com/dhowells/keyutils/$%7BBP%7D.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
    [email protected] <mailto:[email protected]>
    https://lists.yoctoproject.org/listinfo/yocto