summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2018-07-19 19:49:31 -0700
committerKhem Raj <raj.khem@gmail.com>2018-07-20 16:14:22 -0700
commitaf574eed885a42146458e3a5e3fd83a172b69fa9 (patch)
tree740980ba771a377949e1ae2d36a49eea1a4443f5
parent625e1e58d006938396c826dc9de56b0d0ca308a9 (diff)
downloadmeta-openembedded-af574eed885a42146458e3a5e3fd83a172b69fa9.tar.gz
liblockfile: Upgrade to 1.14
* 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 <mingli.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch48
-rw-r--r--meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch21
-rw-r--r--meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch20
-rw-r--r--meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch54
-rw-r--r--meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch54
-rw-r--r--meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch31
-rw-r--r--meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch (renamed from meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch)0
-rw-r--r--meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch33
-rw-r--r--meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb35
-rw-r--r--meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb37
10 files changed, 155 insertions, 178 deletions
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch
deleted file mode 100644
index a9319ff1e3..0000000000
--- a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- liblockfile-1.05/Makefile.in~install
7+++ liblockfile-1.05/Makefile.in
8@@ -20,6 +20,7 @@
9 includedir = @includedir@
10
11 MAILGROUP = @MAILGROUP@
12+INSTGRP = $(if $(MAILGROUP),-g $(MAILGROUP))
13
14 all: @TARGETS@
15 install: @INSTALL_TARGETS@
16@@ -50,25 +51,27 @@
17 $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
18
19 install_static: static install_common
20+ install -d $(ROOT)$(libdir)
21 install -m 644 liblockfile.a $(ROOT)$(libdir)
22
23 install_shared: shared install_common
24+ install -d $(ROOT)$(libdir)
25 install -m 755 liblockfile.so \
26 $(ROOT)$(libdir)/liblockfile.so.$(VER)
27 ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
28 if test "$(ROOT)" = ""; then @LDCONFIG@; fi
29
30 install_common:
31+ install -d $(ROOT)$(includedir)
32 install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
33- if [ "$(MAILGROUP)" != "" ]; then\
34- install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
35- else \
36- install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
37- fi
38+ install -d $(ROOT)$(bindir)
39+ install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir)
40+ install -d $(ROOT)$(mandir)/man1 $(ROOT)$(mandir)/man3
41 install -m 644 *.1 $(ROOT)$(mandir)/man1
42 install -m 644 *.3 $(ROOT)$(mandir)/man3
43
44 install_nfslib: nfslib
45+ install -d $(ROOT)$(nfslockdir)
46 install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
47 if test "$(ROOT)" = ""; then @LDCONFIG@; fi
48
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch
deleted file mode 100644
index eb1d1478b8..0000000000
--- a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- liblockfile-1.05/Makefile.in~ldflags
7+++ liblockfile-1.05/Makefile.in
8@@ -34,11 +34,11 @@
9
10 liblockfile.so: liblockfile.a
11 $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
12- -o liblockfile.so lockfile.o -lc
13+ -o liblockfile.so lockfile.o $(LDFLAGS) -lc
14
15 nfslock.so.$(VER): nfslock.o
16 $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
17- -o nfslock.so.$(NVER) nfslock.o
18+ -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS)
19
20 dotlockfile: dotlockfile.o xlockfile.o
21 $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o
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
deleted file mode 100644
index 27f760c832..0000000000
--- a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Upstream-Status: Inappropriate [no upstream]
2
3The extend so file is rename from nfslock.so.$(VER) to nfslock.so.$(NVER). That
4causes file nfslock.so.0.1 is installed into manual directory. Fix it.
5
6Signed-off-by: Kai Kang <kai.kang@windriver.com>
7
8diff --git a/Makefile.in b/Makefile.in
9index 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/liblockfile-fix-nfslib-and-soname.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch
deleted file mode 100644
index ffd7a40fab..0000000000
--- a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1Upstream-Status: Inappropriate [no upstream]
2
3* nfslib should use NVER instead of VER
4* install the missing soname library
5
6Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
7---
8 Makefile.in | 9 ++++++---
9 1 files changed, 5 insertions(+), 3 deletions(-)
10
11diff --git a/Makefile.in b/Makefile.in
12index 836ca9b..a589fb8 100644
13--- a/Makefile.in
14+++ b/Makefile.in
15@@ -27,7 +27,7 @@ install: @INSTALL_TARGETS@
16
17 static: liblockfile.a dotlockfile
18 shared: liblockfile.so dotlockfile
19-nfslib: nfslock.so.$(VER)
20+nfslib: nfslock.so.$(NVER)
21
22 liblockfile.a: lockfile.o
23 $(AR) rv liblockfile.a lockfile.o
24@@ -36,7 +36,7 @@ liblockfile.so: liblockfile.a
25 $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
26 -o liblockfile.so lockfile.o $(LDFLAGS) -lc
27
28-nfslock.so.$(VER): nfslock.o
29+nfslock.so.$(NVER): nfslock.o
30 $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
31 -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS)
32
33@@ -59,6 +59,7 @@ install_shared: shared install_common
34 install -m 755 liblockfile.so \
35 $(ROOT)$(libdir)/liblockfile.so.$(VER)
36 ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
37+ ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so.1
38 if test "$(ROOT)" = ""; then @LDCONFIG@; fi
39
40 install_common:
41@@ -72,7 +73,9 @@ install_common:
42
43 install_nfslib: nfslib
44 install -d $(ROOT)$(nfslockdir)
45- install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
46+ install -m 755 nfslock.so.$(NVER) $(ROOT)$(nfslockdir)
47+ ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so
48+ ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so.0
49 if test "$(ROOT)" = ""; then @LDCONFIG@; fi
50
51 clean:
52--
531.7.9.5
54
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch
new file mode 100644
index 0000000000..ea415dd8ba
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch
@@ -0,0 +1,54 @@
1From 67843dabe1177840697839b916fd899218893ec7 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Thu, 19 Jul 2018 00:25:23 -0700
4Subject: [PATCH] Makefile.in: add DESTDIR
5
6Add DESTDIR to fix below error during do_install
7
8| install -d -m 755 -g root -p /usr/include
9| install -d -m 755 -g root -p /usr/lib
10| install -d -m 755 -g root -p /usr/bin
11| install -m 755 nfslock.so.0.1 /usr/lib
12| install -d -m 755 -g root -p /usr/share/man/man1
13| install: cannot create regular file '/usr/lib/nfslock.so.0.1': Permission denied
14| Makefile:78: recipe for target 'install_nfslib' failed
15| make: *** [install_nfslib] Error 1
16| make: *** Waiting for unfinished jobs....
17| install -d -m 755 -g root -p /usr/share/man/man3
18| install -m 644 lockfile.h maillock.h /usr/include
19| install: cannot create regular file '/usr/include/lockfile.h': Permission denied
20| install: cannot create regular file '/usr/include/maillock.h': Permission denied
21| Makefile:64: recipe for target 'install_common' failed
22| make: *** [install_common] Error 1
23
24Upstream-Status: Inappropriate [oe specific]
25
26Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
27---
28 Makefile.in | 10 +++++-----
29 1 file changed, 5 insertions(+), 5 deletions(-)
30
31diff --git a/Makefile.in b/Makefile.in
32index 36a6d23..1e4130e 100644
33--- a/Makefile.in
34+++ b/Makefile.in
35@@ -12,11 +12,11 @@ CC = @CC@
36
37 prefix = $(DESTDIR)@prefix@
38 exec_prefix = @exec_prefix@
39-bindir = @bindir@
40-libdir = @libdir@
41-mandir = @mandir@
42-nfslockdir = @nfslockdir@
43-includedir = @includedir@
44+bindir = $(DESTDIR)@bindir@
45+libdir = $(DESTDIR)@libdir@
46+mandir = $(DESTDIR)@mandir@
47+nfslockdir = $(DESTDIR)@nfslockdir@
48+includedir = $(DESTDIR)@includedir@
49 datarootdir = @datarootdir@
50 MAILGROUP = @MAILGROUP@
51
52--
532.17.1
54
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch
new file mode 100644
index 0000000000..a6b297b592
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch
@@ -0,0 +1,31 @@
1From 631d46efff2a6d8970e202ba5422ebedd17a8d2f Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Thu, 19 Jul 2018 01:00:10 -0700
4Subject: [PATCH] Makefile.in: install nfslock.so and nfslock.so.0
5
6* install the missing soname library
7
8Upstream-Status: Pending
9
10Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
11Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
12---
13 Makefile.in | 2 ++
14 1 file changed, 2 insertions(+)
15
16diff --git a/Makefile.in b/Makefile.in
17index 1e4130e..0f1b506 100644
18--- a/Makefile.in
19+++ b/Makefile.in
20@@ -77,6 +77,8 @@ install_common:
21 install_nfslib: nfslib
22 install -d -m 755 -g root -p $(nfslockdir)
23 install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
24+ ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so
25+ ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0
26 if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
27
28 clean:
29--
302.17.1
31
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch
index ea13e11d25..ea13e11d25 100644
--- a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch
new file mode 100644
index 0000000000..da25033393
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch
@@ -0,0 +1,33 @@
1From 363eb1aaeca914c7d36a2cdaf1417e4f87af4c22 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Thu, 19 Jul 2018 01:12:47 -0700
4Subject: [PATCH] Makefile.in: define dotlockfile.1 installed to man
5
6Explicitly define dotlockfile.1 installed to man
7dir to avoid nfslock.so.0.1 is installed into man
8directory
9
10Upstream-Status: Pending
11
12Signed-off-by: Kai Kang <kai.kang@windriver.com>
13Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
14---
15 Makefile.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/Makefile.in b/Makefile.in
19index 0f1b506..6e53179 100644
20--- a/Makefile.in
21+++ b/Makefile.in
22@@ -71,7 +71,7 @@ install_common:
23 else \
24 install -g root -m 755 dotlockfile $(bindir); \
25 fi
26- install -m 644 *.1 $(mandir)/man1
27+ install -m 644 dotlockfile.1 $(mandir)/man1
28 install -m 644 *.3 $(mandir)/man3
29
30 install_nfslib: nfslib
31--
322.17.1
33
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb
deleted file mode 100644
index 0c41afa3c0..0000000000
--- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb
+++ /dev/null
@@ -1,35 +0,0 @@
1SUMMARY = "File locking library"
2HOMEPAGE = "http://packages.qa.debian.org/libl/liblockfile.html"
3SECTION = "libs"
4LICENSE = "LGPLv2+ & GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ac284a60d48eaa4bc811cddc377fa341"
6
7SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz \
8 ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09-6.debian.tar.bz2;name=1.09-6 \
9 file://install.patch \
10 file://configure.patch \
11 file://ldflags.patch \
12 file://liblockfile-fix-nfslib-and-soname.patch \
13 file://liblockfile-fix-install-so-to-man-dir.patch \
14"
15
16SRC_URI[md5sum] = "2aa269e4405ee8235ff17d1b357c6ae8"
17SRC_URI[sha256sum] = "16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f"
18
19SRC_URI[1.09-6.md5sum] = "a2811807e63a526c07b0f60626e329a2"
20SRC_URI[1.09-6.sha256sum] = "d45eacb7c637c16d03c777c55989d98da494ae9584a0783fe6dbf0db60fa290f"
21
22inherit autotools-brokensep
23
24# set default mailgroup to mail
25# --with-libnfslock specify where to install nfslock.so.NVER
26EXTRA_OECONF = "--enable-shared \
27 --with-mailgroup=mail \
28 --with-libnfslock=${libdir} \
29"
30
31# Makefile using ROOT not DESTDIR
32EXTRA_OEMAKE += "ROOT=${D}"
33
34FILES_${PN} += "${libdir}/nfslock.so.*"
35FILES_${PN}-dev += "${libdir}/nfslock.so"
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
new file mode 100644
index 0000000000..de2c1e36d3
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
@@ -0,0 +1,37 @@
1SUMMARY = "File locking library"
2HOMEPAGE = "http://packages.qa.debian.org/libl/liblockfile.html"
3SECTION = "libs"
4LICENSE = "LGPLv2+ & GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f4ba6ad04fcb05cc30a4cfa5062c55a3"
6
7SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz \
8 ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14-1.debian.tar.bz2;name=1.14-1 \
9 file://configure.patch \
10 file://0001-Makefile.in-add-DESTDIR.patch \
11 file://0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch \
12 file://liblockfile-fix-install-so-to-man-dir.patch \
13"
14
15SRC_URI[md5sum] = "420c056ba0cc4d1477e402f70ba2f5eb"
16SRC_URI[sha256sum] = "ab40d4a3e8cbc204f7e87fea637a4e4ddf9a1149aaa0a723a4267febd0b1d060"
17
18SRC_URI[1.14-1.md5sum] = "f9a44928c3477d218c56252712ebc479"
19SRC_URI[1.14-1.sha256sum] = "73f9be769e602149391588c28f0f4f5cda131e30fb94c0777dbb23d811ac21ff"
20
21S = "${WORKDIR}/${BPN}"
22
23inherit autotools-brokensep
24
25# set default mailgroup to mail
26# --with-libnfslock specify where to install nfslock.so.NVER
27EXTRA_OECONF = "--enable-shared \
28 --with-mailgroup=mail \
29 --with-libnfslock=${libdir} \
30"
31
32# Makefile using DESTDIR as the change in e35f9eabcbba224ecc70b145d5d2a2d81064c195
33# at https://github.com/miquels/liblockfile.git
34EXTRA_OEMAKE += "DESTDIR=${D}"
35
36FILES_${PN} += "${libdir}/nfslock.so.*"
37FILES_${PN}-dev += "${libdir}/nfslock.so"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-04 00:39:18 +0000