diff options
author | 2020-03-30 09:24:26 +0900 | |
---|---|---|
committer | 2020-03-30 09:24:26 +0900 | |
commit | 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd (patch) | |
tree | b4bb18dcd1487dbf1ea8127e5671b7bb2eded033 /external/meta-openembedded/meta-oe/recipes-extended/liblockfile | |
parent | 706ad73eb02caf8532deaf5d38995bd258725cb8 (diff) |
agl-basesystem
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-extended/liblockfile')
5 files changed, 180 insertions, 0 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch b/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch new file mode 100644 index 00000000..ea415dd8 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch @@ -0,0 +1,54 @@ +From 67843dabe1177840697839b916fd899218893ec7 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 36a6d23..1e4130e 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.17.1 + diff --git a/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch b/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch new file mode 100644 index 00000000..a6b297b5 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch @@ -0,0 +1,31 @@ +From 631d46efff2a6d8970e202ba5422ebedd17a8d2f 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 1e4130e..0f1b506 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -77,6 +77,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 + + clean: +-- +2.17.1 + diff --git a/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch b/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch new file mode 100644 index 00000000..ea13e11d --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch @@ -0,0 +1,25 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- liblockfile-1.05/./configure.in~configure ++++ liblockfile-1.05/./configure.in +@@ -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(INSTALL_TARGETS) + AC_SUBST(nfslockdir) + +-AC_OUTPUT(\ ++AC_CONFIG_FILES([\ + ./Makefile \ + ./maillock.h \ +-) ++]) ++AC_OUTPUT diff --git a/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch b/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch new file mode 100644 index 00000000..da250333 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch @@ -0,0 +1,33 @@ +From 363eb1aaeca914c7d36a2cdaf1417e4f87af4c22 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 0f1b506..6e53179 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -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 + diff --git a/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb b/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb new file mode 100644 index 00000000..de2c1e36 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb @@ -0,0 +1,37 @@ +SUMMARY = "File locking library" +HOMEPAGE = "http://packages.qa.debian.org/libl/liblockfile.html" +SECTION = "libs" +LICENSE = "LGPLv2+ & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f4ba6ad04fcb05cc30a4cfa5062c55a3" + +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://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] = "420c056ba0cc4d1477e402f70ba2f5eb" +SRC_URI[sha256sum] = "ab40d4a3e8cbc204f7e87fea637a4e4ddf9a1149aaa0a723a4267febd0b1d060" + +SRC_URI[1.14-1.md5sum] = "f9a44928c3477d218c56252712ebc479" +SRC_URI[1.14-1.sha256sum] = "73f9be769e602149391588c28f0f4f5cda131e30fb94c0777dbb23d811ac21ff" + +S = "${WORKDIR}/${BPN}" + +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" |