diff options
| author |   Kang Kai <kai.kang@windriver.com> | 2015-07-17 11:10:01 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-07-30 21:03:27 +0200 |
| commit | 0627251be644bb3c4cbc46eb7a33801afb5aefe9 (patch) | |
| tree | a0ca70a561408cf2d787c1183233a78cda6a27f5 | |
| parent | 54a9b63be4c9944e71c4eb23892b717e1d7693c4 (diff) | |
| download | meta-openembedded-contrib-0627251be644bb3c4cbc46eb7a33801afb5aefe9.tar.gz | |
liblockfile: add patch of version 1.09-6 from debian
Add patch of liblockfile 1.09-6 from debian. And fix error which install
so file to manual directory.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch | 20 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb | 5 |
2 files changed, 25 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch new file mode 100644 index 0000000000..27f760c832 --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch @@ -0,0 +1,20 @@ +Upstream-Status: Inappropriate [no upstream] + +The extend so file is rename from nfslock.so.$(VER) to nfslock.so.$(NVER). That +causes file nfslock.so.0.1 is installed into manual directory. Fix it. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +diff --git a/Makefile.in b/Makefile.in +index a589fb8..46a57e8 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -68,7 +68,7 @@ install_common: + install -d $(ROOT)$(bindir) + install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir) + install -d $(ROOT)$(mandir)/man1 $(ROOT)$(mandir)/man3 +- install -m 644 *.1 $(ROOT)$(mandir)/man1 ++ install -m 644 dotlockfile.1 $(ROOT)$(mandir)/man1 + install -m 644 *.3 $(ROOT)$(mandir)/man3 + + install_nfslib: nfslib diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb index 38e1915e4f..e5655b5057 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb +++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb @@ -4,15 +4,20 @@ LICENSE = "LGPLv2+ & GPLv2+" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ac284a60d48eaa4bc811cddc377fa341" SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz \ + ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09-6.debian.tar.bz2;name=1.09-6 \ file://install.patch \ file://configure.patch \ file://ldflags.patch \ file://liblockfile-fix-nfslib-and-soname.patch \ + file://liblockfile-fix-install-so-to-man-dir.patch \ " SRC_URI[md5sum] = "2aa269e4405ee8235ff17d1b357c6ae8" SRC_URI[sha256sum] = "16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f" +SRC_URI[1.09-6.md5sum] = "a2811807e63a526c07b0f60626e329a2" +SRC_URI[1.09-6.sha256sum] = "d45eacb7c637c16d03c777c55989d98da494ae9584a0783fe6dbf0db60fa290f" + inherit autotools-brokensep # set default mailgroup to mail |