diff options
Diffstat (limited to 'meta-oe/recipes-extended/liblockfile/liblockfile')
6 files changed, 144 insertions, 18 deletions
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 index ea415dd8ba..2533b3a008 100644 --- 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 @@ -1,4 +1,4 @@ -From 67843dabe1177840697839b916fd899218893ec7 Mon Sep 17 00:00:00 2001 +From 8e370a2f35d0c3472ddc9068fab19d0077434c61 Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> Date: Thu, 19 Jul 2018 00:25:23 -0700 Subject: [PATCH] Makefile.in: add DESTDIR @@ -29,7 +29,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 36a6d23..1e4130e 100644 +index 9c74b35..8cbda1d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -12,11 +12,11 @@ CC = @CC@ @@ -50,5 +50,5 @@ index 36a6d23..1e4130e 100644 MAILGROUP = @MAILGROUP@ -- -2.17.1 +2.25.1 diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch new file mode 100644 index 0000000000..1fd5c827ba --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch @@ -0,0 +1,63 @@ +From 8b3a5916fff4004b5b2f1e8a1d3a051346ba3901 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 10 Mar 2023 08:59:39 +0800 +Subject: [PATCH] Makefile.in: fix install failure on host without ldconfig + +fix syntax error when ldconfig is not installed on host + +when ldconfig is not installed on the build host, install will failed with +error: +ln -sf nfslock.so.0.1 /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/lib64/nfslock.so.0 +install -m 644 lockfile.h maillock.h /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/include +if test "/mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image" = ""; then ; fi +if [ "mail" != "" ]; then\ + install -g mail -m 2755 dotlockfile /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/bin;\ + else \ + install -g root -m 755 dotlockfile /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/bin; \ + fi +/bin/sh: -c: line 1: syntax error near unexpected token `;' +/bin/sh: -c: line 1: `if test "/mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image" = ""; then ; fi' + +Upstream-Status: Submitted [https://github.com/miquels/liblockfile/pull/20] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + Makefile.in | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e02d75e..5fc5b5a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -9,6 +9,10 @@ NFSVER = 0.1 + CFLAGS = @CFLAGS@ -I. + LDFLAGS = @LDFLAGS@ + CC = @CC@ ++LDCONFIG = @LDCONFIG@ ++ifeq ($(LDCONFIG),) ++ LDCONFIG = ":" ++endif + + prefix = $(DESTDIR)@prefix@ + exec_prefix = @exec_prefix@ +@@ -69,7 +73,7 @@ install_shared: shared install_static install_common + $(libdir)/liblockfile.so.$(SOVER) + ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR) + ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so +- if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi ++ if test "$(DESTDIR)" = ""; then $(LDCONFIG); fi + + install_common: + install -d -m 755 -g root -p $(includedir) +@@ -90,7 +94,7 @@ install_nfslib: nfslib + install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) + ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so + ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0 +- if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi ++ if test "$(DESTDIR)" = ""; then $(LDCONFIG); fi + + test: test-stamp + @: +-- +2.25.1 + diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch index a6b297b592..f99ac2bf7a 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch @@ -1,4 +1,4 @@ -From 631d46efff2a6d8970e202ba5422ebedd17a8d2f Mon Sep 17 00:00:00 2001 +From 0f34d1d91d641c3d5c5bb2eb11bd6eec7cfaf738 Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> Date: Thu, 19 Jul 2018 01:00:10 -0700 Subject: [PATCH] Makefile.in: install nfslock.so and nfslock.so.0 @@ -14,10 +14,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 1 file changed, 2 insertions(+) diff --git a/Makefile.in b/Makefile.in -index 1e4130e..0f1b506 100644 +index 8cbda1d..3a74811 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -77,6 +77,8 @@ install_common: +@@ -88,6 +88,8 @@ install_common: install_nfslib: nfslib install -d -m 755 -g root -p $(nfslockdir) install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) @@ -25,7 +25,7 @@ index 1e4130e..0f1b506 100644 + ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0 if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi - clean: + test: test-stamp -- -2.17.1 +2.25.1 diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-redefine-LOCKPROG.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-redefine-LOCKPROG.patch new file mode 100644 index 0000000000..c387db123f --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-redefine-LOCKPROG.patch @@ -0,0 +1,51 @@ +From 05227e74b732f13ed5a2a98232676f98bba028e6 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Fri, 12 Aug 2022 11:18:15 +0800 +Subject: [PATCH] Makefile.in: redefine LOCKPROG + +By default the LOCKPROG will be expanded as below: +LOCKPROG="/build/tmp-glibc/work/core2-32-wrs-linux/liblockfile/1.14-r0/image/usr/bin/dotlockfile" + +And it should be "/usr/bin/dotlockfile" on the target. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> + +Update patch for 1.17, also redefine LOCKPROG in other lines +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e447cb2..e02d75e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -44,19 +44,19 @@ dotlockfile: dotlockfile.o dlockfile.o + $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o dlockfile.o + + dotlockfile.o: dotlockfile.c +- $(CC) $(CFLAGS) -DLOCKPROG=\"$(bindir)/dotlockfile\" \ ++ $(CC) $(CFLAGS) -DLOCKPROG=\"/usr/bin/dotlockfile\" \ + -c dotlockfile.c + + lockfile.o: lockfile.c +- $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"$(bindir)/dotlockfile\" \ ++ $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"/usr/bin/dotlockfile\" \ + -DSTATIC -c lockfile.c + + solockfile.o: lockfile.c +- $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"$(bindir)/dotlockfile\" \ ++ $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"/usr/bin/dotlockfile\" \ + -c lockfile.c -o solockfile.o + + dlockfile.o: lockfile.c +- $(CC) $(CFLAGS) -DLOCKPROG=\"$(bindir)/dotlockfile\" \ ++ $(CC) $(CFLAGS) -DLOCKPROG=\"/usr/bin/dotlockfile\" \ + -c lockfile.c -o dlockfile.o + + install_static: static install_common +-- +2.25.1 + diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch index ea13e11d25..2bdf96e639 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch @@ -1,10 +1,19 @@ +From fd3fce8c1a3d0c70a0ffd461fbbe7e2ef71dd3a7 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 7 Mar 2023 11:05:45 +0800 +Subject: [PATCH] Update patch for 1.17 -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- +Upstream-Status: Pending ---- liblockfile-1.05/./configure.in~configure -+++ liblockfile-1.05/./configure.in + configure.ac | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index df26cee..76e9165 100644 +--- a/configure.ac ++++ b/configure.ac @@ -1,4 +1,5 @@ -AC_INIT(lockfile.c) +AC_INIT @@ -12,7 +21,7 @@ AC_CONFIG_HEADER(autoconf.h) AC_REVISION($Revision: 1.0 $)dnl -@@ -111,7 +112,8 @@ +@@ -111,7 +112,8 @@ AC_SUBST(TARGETS) AC_SUBST(INSTALL_TARGETS) AC_SUBST(nfslockdir) @@ -23,3 +32,6 @@ -) +]) +AC_OUTPUT +-- +2.25.1 + 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 index da25033393..046cd8e693 100644 --- 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 @@ -1,4 +1,4 @@ -From 363eb1aaeca914c7d36a2cdaf1417e4f87af4c22 Mon Sep 17 00:00:00 2001 +From 079d04c187800e22f18723c74e41c4e46eef67f8 Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> Date: Thu, 19 Jul 2018 01:12:47 -0700 Subject: [PATCH] Makefile.in: define dotlockfile.1 installed to man @@ -16,10 +16,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 0f1b506..6e53179 100644 +index 3a74811..e447cb2 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -71,7 +71,7 @@ install_common: +@@ -82,7 +82,7 @@ install_common: else \ install -g root -m 755 dotlockfile $(bindir); \ fi @@ -29,5 +29,5 @@ index 0f1b506..6e53179 100644 install_nfslib: nfslib -- -2.17.1 +2.25.1 |