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 /meta-oe/recipes-extended | |
parent | 54a9b63be4c9944e71c4eb23892b717e1d7693c4 (diff) | |
download | meta-openembedded-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>
Diffstat (limited to 'meta-oe/recipes-extended')
-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 000000000..27f760c83 --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Upstream-Status: Inappropriate [no upstream] | ||
2 | |||
3 | The extend so file is rename from nfslock.so.$(VER) to nfslock.so.$(NVER). That | ||
4 | causes file nfslock.so.0.1 is installed into manual directory. Fix it. | ||
5 | |||
6 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
7 | |||
8 | diff --git a/Makefile.in b/Makefile.in | ||
9 | index a589fb8..46a57e8 100644 | ||
10 | --- a/Makefile.in | ||
11 | +++ b/Makefile.in | ||
12 | @@ -68,7 +68,7 @@ install_common: | ||
13 | install -d $(ROOT)$(bindir) | ||
14 | install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir) | ||
15 | install -d $(ROOT)$(mandir)/man1 $(ROOT)$(mandir)/man3 | ||
16 | - install -m 644 *.1 $(ROOT)$(mandir)/man1 | ||
17 | + install -m 644 dotlockfile.1 $(ROOT)$(mandir)/man1 | ||
18 | install -m 644 *.3 $(ROOT)$(mandir)/man3 | ||
19 | |||
20 | 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 38e1915e4..e5655b505 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+" | |||
4 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ac284a60d48eaa4bc811cddc377fa341" | 4 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ac284a60d48eaa4bc811cddc377fa341" |
5 | 5 | ||
6 | SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz \ | 6 | SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz \ |
7 | ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09-6.debian.tar.bz2;name=1.09-6 \ | ||
7 | file://install.patch \ | 8 | file://install.patch \ |
8 | file://configure.patch \ | 9 | file://configure.patch \ |
9 | file://ldflags.patch \ | 10 | file://ldflags.patch \ |
10 | file://liblockfile-fix-nfslib-and-soname.patch \ | 11 | file://liblockfile-fix-nfslib-and-soname.patch \ |
12 | file://liblockfile-fix-install-so-to-man-dir.patch \ | ||
11 | " | 13 | " |
12 | 14 | ||
13 | SRC_URI[md5sum] = "2aa269e4405ee8235ff17d1b357c6ae8" | 15 | SRC_URI[md5sum] = "2aa269e4405ee8235ff17d1b357c6ae8" |
14 | SRC_URI[sha256sum] = "16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f" | 16 | SRC_URI[sha256sum] = "16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f" |
15 | 17 | ||
18 | SRC_URI[1.09-6.md5sum] = "a2811807e63a526c07b0f60626e329a2" | ||
19 | SRC_URI[1.09-6.sha256sum] = "d45eacb7c637c16d03c777c55989d98da494ae9584a0783fe6dbf0db60fa290f" | ||
20 | |||
16 | inherit autotools-brokensep | 21 | inherit autotools-brokensep |
17 | 22 | ||
18 | # set default mailgroup to mail | 23 | # set default mailgroup to mail |