added my Recipes
This commit is contained in:
@@ -0,0 +1,54 @@
|
||||
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
|
||||
|
||||
Add DESTDIR to fix below error during do_install
|
||||
|
||||
| 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
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
Makefile.in | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 9c74b35..8cbda1d 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -12,11 +12,11 @@ CC = @CC@
|
||||
|
||||
prefix = $(DESTDIR)@prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
-bindir = @bindir@
|
||||
-libdir = @libdir@
|
||||
-mandir = @mandir@
|
||||
-nfslockdir = @nfslockdir@
|
||||
-includedir = @includedir@
|
||||
+bindir = $(DESTDIR)@bindir@
|
||||
+libdir = $(DESTDIR)@libdir@
|
||||
+mandir = $(DESTDIR)@mandir@
|
||||
+nfslockdir = $(DESTDIR)@nfslockdir@
|
||||
+includedir = $(DESTDIR)@includedir@
|
||||
datarootdir = @datarootdir@
|
||||
MAILGROUP = @MAILGROUP@
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
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
|
||||
|
||||
* install the missing soname library
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
Makefile.in | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 8cbda1d..3a74811 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -88,6 +88,8 @@ install_common:
|
||||
install_nfslib: nfslib
|
||||
install -d -m 755 -g root -p $(nfslockdir)
|
||||
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
|
||||
|
||||
test: test-stamp
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
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
|
||||
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
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
|
||||
+AC_CONFIG_SRCDIR([lockfile.c])
|
||||
AC_CONFIG_HEADER(autoconf.h)
|
||||
AC_REVISION($Revision: 1.0 $)dnl
|
||||
|
||||
@@ -111,7 +112,8 @@ AC_SUBST(TARGETS)
|
||||
AC_SUBST(INSTALL_TARGETS)
|
||||
AC_SUBST(nfslockdir)
|
||||
|
||||
-AC_OUTPUT(\
|
||||
+AC_CONFIG_FILES([\
|
||||
./Makefile \
|
||||
./maillock.h \
|
||||
-)
|
||||
+])
|
||||
+AC_OUTPUT
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
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
|
||||
|
||||
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 <kai.kang@windriver.com>
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 3a74811..e447cb2 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -82,7 +82,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.25.1
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
SUMMARY = "File locking library"
|
||||
HOMEPAGE = "http://packages.qa.debian.org/libl/liblockfile.html"
|
||||
SECTION = "libs"
|
||||
LICENSE = "LGPL-2.0-or-later & GPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f4ba6ad04fcb05cc30a4cfa5062c55a3"
|
||||
|
||||
SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.17.orig.tar.gz \
|
||||
${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.17-1.debian.tar.bz2;name=1.17-1 \
|
||||
file://configure.patch \
|
||||
file://0001-Makefile.in-add-DESTDIR.patch \
|
||||
file://0001-Makefile.in-install-nfslock-libs.patch \
|
||||
file://liblockfile-fix-install-so-to-man-dir.patch \
|
||||
file://0001-Makefile.in-redefine-LOCKPROG.patch \
|
||||
file://0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "6e937f3650afab4aac198f348b89b1ca42edceb17fb6bb0918f642143ccfd15e"
|
||||
SRC_URI[1.17-1.sha256sum] = "e3657c0e3facfeccb58900c0b48d56cd68ad5f9f24d1b4c6eaa69c26490fb673"
|
||||
|
||||
S = "${WORKDIR}/${BP}"
|
||||
|
||||
inherit autotools-brokensep
|
||||
|
||||
# set default mailgroup to mail
|
||||
# --with-libnfslock specify where to install nfslock.so.NVER
|
||||
EXTRA_OECONF = "--enable-shared \
|
||||
--with-mailgroup=mail \
|
||||
--with-libnfslock=${libdir} \
|
||||
"
|
||||
|
||||
# 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"
|
||||
Reference in New Issue
Block a user