liblockfile: Upgrade to 1.14
PATCH 1/1 liblockfile: Upgrade to 1.14
From: Mingli Yu <[email protected]>
* Licence-Update:
- Copyright years are updated from 2011 to 2016
- The text as below
"On Debian GNU/Linux systems, the complete text of the GNU Lesser General \
Public License can be found in `/usr/share/common-licenses/LGPL-2'. You can \
also find a copy on the GNU website at http://www.gnu.org"
updated to
"The complete LGPL-2 license is included in the licenses/ directory."
* Compared to liblockfile_1.09.orig.tar.gz unpack to ${WORKDIR}/${BPN}-${PV}, liblockfile_1.14.orig.tar.gz
unpack to ${WORKDIR}/${BPN} now.
Add S = "${WORKDIR}/${BPN}" to fix the gap
* Remove two backported patch
- install.patch
- ldflags.patch
* Use DESTDIR instead of the previous ROOT and add
patch 0001-Makefile.in-add-DESTDIR.patch to fix
below issue:
| install -d -m 755 -g root -p /usr/include | install -d -m 755 -g root -p /usr/lib | install -d -m 755 -g root -p /usr/bin | install -m 755 nfslock.so.0.1 /usr/lib | install -d -m 755 -g root -p /usr/share/man/man1 | install: cannot create regular file '/usr/lib/nfslock.so.0.1': Permission denied | Makefile:78: recipe for target 'install_nfslib' failed | make: *** [install_nfslib] Error 1 | make: *** Waiting for unfinished jobs.... | install -d -m 755 -g root -p /usr/share/man/man3 | install -m 644 lockfile.h maillock.h /usr/include | install: cannot create regular file '/usr/include/lockfile.h': Permission denied | install: cannot create regular file '/usr/include/maillock.h': Permission denied | Makefile:64: recipe for target 'install_common' failed | make: *** [install_common] Error 1
* Rework patch:
- Rework liblockfile-fix-nfslib-and-soname.patch to 0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch as the previous patch partly in upstream
- liblockfile-fix-install-so-to-man-dir.patch
Signed-off-by Mingli Yu <[email protected]>
---
.../liblockfile-1.09/install.patch | 48 ----------------
.../liblockfile-1.09/ldflags.patch | 21 -------
.../0001-Makefile.in-add-DESTDIR.patch | 54 ++++++++++++++++++
...install-nfslock.so-and-nfslock.so.0.patch} | 57 ++++++-------------
.../configure.patch | 0
...iblockfile-fix-install-so-to-man-dir.patch | 35 ++++++++----
...iblockfile_1.09.bb => liblockfile_1.14.bb} | 26 +++++----
7 files changed, 109 insertions(+), 132 deletions(-)
delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch
delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch
create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch
rename meta-oe/recipes-extended/liblockfile/{liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch => liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch} (13%)
rename meta-oe/recipes-extended/liblockfile/{liblockfile-1.09 => liblockfile}/configure.patch (100%)
rename meta-oe/recipes-extended/liblockfile/{liblockfile-1.09 => liblockfile}/liblockfile-fix-install-so-to-man-dir.patch (17%)
rename meta-oe/recipes-extended/liblockfile/{liblockfile_1.09.bb => liblockfile_1.14.bb} (44%)meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch deleted +0 -48
@@ -1,48 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- liblockfile-1.05/Makefile.in~install -+++ liblockfile-1.05/Makefile.in -@@ -20,6 +20,7 @@ - includedir = @includedir@ - - MAILGROUP = @MAILGROUP@ -+INSTGRP = $(if $(MAILGROUP),-g $(MAILGROUP)) - - all: @TARGETS@ - install: @INSTALL_TARGETS@ -@@ -50,25 +51,27 @@ - $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o - - install_static: static install_common -+ install -d $(ROOT)$(libdir) - install -m 644 liblockfile.a $(ROOT)$(libdir) - - install_shared: shared install_common -+ install -d $(ROOT)$(libdir) - install -m 755 liblockfile.so \ - $(ROOT)$(libdir)/liblockfile.so.$(VER) - ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - - install_common: -+ install -d $(ROOT)$(includedir) - install -m 644 lockfile.h maillock.h $(ROOT)$(includedir) -- if [ "$(MAILGROUP)" != "" ]; then\ -- install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\ -- else \ -- install -g root -m 755 dotlockfile $(ROOT)$(bindir); \ -- fi -+ 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 *.3 $(ROOT)$(mandir)/man3 - - install_nfslib: nfslib -+ install -d $(ROOT)$(nfslockdir) - install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir) - if test "$(ROOT)" = ""; then @LDCONFIG@; fi -
meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch deleted +0 -21
@@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- liblockfile-1.05/Makefile.in~ldflags -+++ liblockfile-1.05/Makefile.in -@@ -34,11 +34,11 @@ - - liblockfile.so: liblockfile.a - $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \ -- -o liblockfile.so lockfile.o -lc -+ -o liblockfile.so lockfile.o $(LDFLAGS) -lc - - nfslock.so.$(VER): nfslock.o - $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \ -- -o nfslock.so.$(NVER) nfslock.o -+ -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS) - - dotlockfile: dotlockfile.o xlockfile.o - $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o
meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch new file +54 -0
54 lines not on this page · raw message
meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch renamed from meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch +17 -40
71 lines not on this page · raw message
meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch renamed from meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch +0 -0
meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch renamed from meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch +24 -11
@@ -1,20 +1,33 @@ -Upstream-Status: Inappropriate [no upstream] +From 363eb1aaeca914c7d36a2cdaf1417e4f87af4c22 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <[email protected]> +Date: Thu, 19 Jul 2018 01:12:47 -0700 +Subject: [PATCH] Makefile.in: define dotlockfile.1 installed to man -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. +Explicitly define dotlockfile.1 installed to man +dir to avoid nfslock.so.0.1 is installed into man +directory + +Upstream-Status: Pending Signed-off-by: Kai Kang <[email protected]> +Signed-off-by: Mingli Yu <[email protected]> +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index a589fb8..46a57e8 100644 +index 0f1b506..6e53179 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 +@@ -71,7 +71,7 @@ install_common: + else \ + install -g root -m 755 dotlockfile $(bindir); \ + fi +- install -m 644 *.1 $(mandir)/man1 ++ install -m 644 dotlockfile.1 $(mandir)/man1 + install -m 644 *.3 $(mandir)/man3 install_nfslib: nfslib +-- +2.17.1 +
meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb renamed from meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb +14 -12
@@ -2,22 +2,23 @@ SUMMARY = "File locking library" HOMEPAGE = "http://packages.qa.debian.org/libl/liblockfile.html" SECTION = "libs" LICENSE = "LGPLv2+ & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ac284a60d48eaa4bc811cddc377fa341" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f4ba6ad04fcb05cc30a4cfa5062c55a3" -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 \ +SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz \ + ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14-1.debian.tar.bz2;name=1.14-1 \ file://configure.patch \ - file://ldflags.patch \ - file://liblockfile-fix-nfslib-and-soname.patch \ + file://0001-Makefile.in-add-DESTDIR.patch \ + file://0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch \ file://liblockfile-fix-install-so-to-man-dir.patch \ " -SRC_URI[md5sum] = "2aa269e4405ee8235ff17d1b357c6ae8" -SRC_URI[sha256sum] = "16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f" +SRC_URI[md5sum] = "420c056ba0cc4d1477e402f70ba2f5eb" +SRC_URI[sha256sum] = "ab40d4a3e8cbc204f7e87fea637a4e4ddf9a1149aaa0a723a4267febd0b1d060" -SRC_URI[1.09-6.md5sum] = "a2811807e63a526c07b0f60626e329a2" -SRC_URI[1.09-6.sha256sum] = "d45eacb7c637c16d03c777c55989d98da494ae9584a0783fe6dbf0db60fa290f" +SRC_URI[1.14-1.md5sum] = "f9a44928c3477d218c56252712ebc479" +SRC_URI[1.14-1.sha256sum] = "73f9be769e602149391588c28f0f4f5cda131e30fb94c0777dbb23d811ac21ff" + +S = "${WORKDIR}/${BPN}" inherit autotools-brokensep
@@ -28,8 +29,9 @@ EXTRA_OECONF = "--enable-shared \ --with-libnfslock=${libdir} \ " -# Makefile using ROOT not DESTDIR -EXTRA_OEMAKE += "ROOT=${D}" +# Makefile using DESTDIR as the change in e35f9eabcbba224ecc70b145d5d2a2d81064c195 +# at https://github.com/miquels/liblockfile.git +EXTRA_OEMAKE += "DESTDIR=${D}" FILES_${PN} += "${libdir}/nfslock.so.*" FILES_${PN}-dev += "${libdir}/nfslock.so"
Signature · 1 line
2.17.1