summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2015-11-25 09:45:41 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2015-11-25 09:45:41 +0100
commit4c1aa7ac89eb5620808adb35b1dcd4a36acf9786 (patch)
tree0274ed5e8a86dd8c2cd2ece34f10fa3a6e99a1db /patches
parenteb4c40c074b5684d870e5a1025886937cb96d149 (diff)
downloadptxdist-4c1aa7ac89eb5620808adb35b1dcd4a36acf9786.tar.gz
ptxdist-4c1aa7ac89eb5620808adb35b1dcd4a36acf9786.tar.xz
keyutils: don't create wrong link in $DESTDIR/usr/lib
This link will point to "/lib/libkeyutils.so", which is outside of the sysroot. This will break linking against the shared version of libkeyutils. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/keyutils-1.5.9/0001-Makefile-don-t-create-absolute-link-outside-of-DESTD.patch22
-rw-r--r--patches/keyutils-1.5.9/series4
2 files changed, 26 insertions, 0 deletions
diff --git a/patches/keyutils-1.5.9/0001-Makefile-don-t-create-absolute-link-outside-of-DESTD.patch b/patches/keyutils-1.5.9/0001-Makefile-don-t-create-absolute-link-outside-of-DESTD.patch
new file mode 100644
index 000000000..e51df0929
--- /dev/null
+++ b/patches/keyutils-1.5.9/0001-Makefile-don-t-create-absolute-link-outside-of-DESTD.patch
@@ -0,0 +1,22 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Tue, 24 Nov 2015 17:11:37 +0100
+Subject: [PATCH] Makefile: don't create absolute link outside of DESTDIR
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c904eaf6cb55..1f3c6d7f0676 100644
+--- a/Makefile
++++ b/Makefile
+@@ -161,7 +161,7 @@ endif
+ $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+ $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
+ mkdir -p $(DESTDIR)$(USRLIBDIR)
+- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
++ $(LNS) $(SONAME) $(DESTDIR)$(LIBDIR)/$(DEVELLIB)
+ $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
+ $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
+ $(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
diff --git a/patches/keyutils-1.5.9/series b/patches/keyutils-1.5.9/series
new file mode 100644
index 000000000..35904c966
--- /dev/null
+++ b/patches/keyutils-1.5.9/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Makefile-don-t-create-absolute-link-outside-of-DESTD.patch
+# d74c4a397aad9b8ca484847dcd33cb32 - git-ptx-patches magic