From 7f40b7168b897da48694d6e71fd3fd45861bfb19 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 15 May 2020 14:09:53 -0500 Subject: meta-openembedded: subtree update:679bb49126..7c02c7d411 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adam Miartus (1): toybox: allow user to provide own defconfig Adrian Bunk (5): uftrace: Fix PR mraa: Replace -fcommon with fix mozjs: Remove workaround for gcc < 4.9 flatbuffers: Remove workarounds for gcc < 6 protobuf-c: Remove workarounds for gcc < 6 Alejandro Enedino Hernandez Samaniego (2): weechat: introduce weechat recipe providing a fully working IRC client imapfilter: introduce imapfilter recipe providing a mailbox filter through the IMAP protocol Alejandro Hernandez Samaniego (1): remmina: Upgrade to version 1.4.3 Alexander Vickberg (2): tcpdump: Fix PACKAGECONFIG for OpenSSL iperf3: Add OpenSSL build option to PACKAGECONFIG Alistair Francis (2): geany-plugins: Support libgit2 version 1.0 libgit2: Update to v1.0.0 Andreas Müller (5): xfce4-notifyd: upgrade 0.6.0 -> 0.6.1 xfconf: upgrade 4.14.1 -> 4.14.2 xfwm4: upgrade 4.14.1 -> 4.14.2 qpdf: upgrade 9.1.0 -> 10.0.1 qpdf: link libatomic explicitly on mips Bartłomiej Burdukiewicz (2): pugixml: generate pkgconfig files. pugixml: add native and nativesdk BBCLASSEXTEND Claude Bing (3): php: fix PACKAGECONFIG for soap php: fix opcache link error in 7.4 php: update fix for opcache link issue in 7.4.4 Emmanuel Roullit (1): cockpit: fix metainfo.xml file ownership Gianfranco Costamagna (1): cpprest: Disable one more test requiring internet connection Gregory Vimont (1): opencv: 4.1.0 -> 4.3.0 Jonathan Liu (1): x11vnc: fix xfc NULL pointer dereference Jorge Solla (1): Cockpit: Added missing dependency on udisks2 for package cockpit-storaged Khem Raj (7): remmina: Depend on avahi instead of Avahi-ui libgit2: Enable pcre2 regexp backend con2fbmap: Add recipe xf86-input-void: Drop INC_PR nodejs: Fix build with icu 67.1 nss: Remove mcpu to avoid march conflicts pmdk: Update to 1.8 Konrad Weihmann (2): php: fix zip package config php: add multibyte string support config Leon Anavi (1): lirc: upgrade 0.9.4d -> 0.10.1 Michael Haener (1): cockpit: Add recipe version 218 Mingli Yu (10): python3-ntplib: add missing python3-io RDEPENDS python3-pid: add the missing rdepends python3-parallax: add the missing rdepends python3-pkgconfig: add missing rdepends python3-pathlib2: add the missing rdepends python3-ptyprocess: add the missing rdepends python3-pydbus: add the missing rdepends python3-pyudev: add the missing rdepends python3-zipp: add the missing rdepends gnome-themes-extra: correct the recipe name Pierre-Jean Texier (1): ccid: upgrade 1.4.31 -> 1.4.32 Rasmus Villemoes (1): libgpiod: split c++ library to its own package Sean Nyekjaer (1): gpsd: Upgrade 3.19 -> 3.20 Slater, Joseph (2): python-pretty-table: add rdep's python3-pyhamcrest: add rdep Trevor Gamblin (7): python3-py: add python3-netclient to RDEPENDS python3-markdown: add logging and setuptools to RDEPENDS python3-pyrsistent: add python3-numbers to RDEPENDS python3-pytoml: add datetime and stringold to RDEPENDS python3-dbusmock: re-add recipe and fix patch path python3-pyyaml: add python3-netclient to RDEPENDS python3-werkzeug: add python3-logging to RDEPENDS Wang Mingyu (6): mailcap: upgrade 2.1.48 -> 2.1.49 sanlock: upgrade 3.8.0 -> 3.8.1 libcgi-perl: upgrade 4.46 -> 4.47 libencode-perl: upgrade 3.05 -> 3.06 python3-idna: upgrade 2.8 -> 2.9 multipath-tools: upgrade 0.8.3 -> 0.8.4 Yi Zhao (1): nginx: remove /var/log/nginx when do_install Zang Ruochen (8): python3-parse-type: Modify ptest output format python3-pluggy: Modify ptest output format python3-polyline: Modify ptest output format python3-precise-runner: Modify ptest output format python3-prettytable: Modify ptest output format python3-ptyprocess: Modify ptest output format python3-pyasn1: Modify ptest output format python3-pyasn1-modules: Modify ptest output format Zheng Ruoqin (4): python3-pyserial: Modify ptest output format python3-pyroute2: Modify ptest output format v4l-utils: upgrade 1.18.0 -> 1.18.1 cpprest: upgrade 2.10.15 -> 2.10.16 Zong Li (1): Upgrade testfloat to 3e version. niko.mauno@vaisala.com (3): python3-setuptools-scm: Cosmetic improvement python3-setuptools-scm: Add nativesdk to BBCLASSEXTEND python3-attrs: Add nativesdk to BBCLASSEXTEND Change-Id: I696f29557eafda5f9f9d6e26525e1a5819982a4b Signed-off-by: Andrew Geissler --- ...include-Declare-gVERSION-global-as-extern.patch | 31 +++++++++++++ .../meta-oe/recipes-extended/mraa/mraa_git.bb | 3 +- .../files/0001-examples-Initialize-child_idx.patch | 47 +++++++++++++++++++ ...malloc.cfg-Specify-the-host-when-building.patch | 29 ------------ ...e-__FreeBSD__-to-control-secure_getenv-de.patch | 33 -------------- .../meta-oe/recipes-extended/pmdk/pmdk_1.7.bb | 49 -------------------- .../meta-oe/recipes-extended/pmdk/pmdk_1.8.bb | 52 ++++++++++++++++++++++ .../recipes-extended/sanlock/sanlock_3.8.0.bb | 45 ------------------- .../recipes-extended/sanlock/sanlock_3.8.1.bb | 45 +++++++++++++++++++ 9 files changed, 176 insertions(+), 158 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-include-Declare-gVERSION-global-as-extern.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.1.bb (limited to 'meta-openembedded/meta-oe/recipes-extended') diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-include-Declare-gVERSION-global-as-extern.patch b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-include-Declare-gVERSION-global-as-extern.patch new file mode 100644 index 0000000000..d1152ed641 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-include-Declare-gVERSION-global-as-extern.patch @@ -0,0 +1,31 @@ +From dbb5961f106ec42cd70689d933674c9c37aedfe1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Mon, 13 Apr 2020 20:12:11 +0200 +Subject: include: Declare gVERSION global as 'extern'. + +Fixes build with '-fno-common'. + +Upstream-Status: Submitted [https://github.com/eclipse/mraa/pull/1012] +Signed-off-by: Adrian Bunk +--- + include/version.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/version.h b/include/version.h +index 47366ef..3a567a1 100644 +--- a/include/version.h ++++ b/include/version.h +@@ -11,8 +11,8 @@ + extern "C" { + #endif + +-const char* gVERSION; +-const char* gVERSION_SHORT; ++extern const char* gVERSION; ++extern const char* gVERSION_SHORT; + + #ifdef __cplusplus + } +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb index 403d641ee9..7c2441632e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -10,6 +10,7 @@ PV = "2.1.0+git${SRCPV}" SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \ + file://0001-include-Declare-gVERSION-global-as-extern.patch \ " S = "${WORKDIR}/git" @@ -27,8 +28,6 @@ EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH= -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \ " -CFLAGS += "-fcommon" - # Prepend mraa-utils to make sure bindir ends up in there PACKAGES =+ "${PN}-utils" diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch new file mode 100644 index 0000000000..8e2b3c7cbb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch @@ -0,0 +1,47 @@ +From 721a48e5397bd4ab454482041e55671eae7b189f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 11 May 2020 18:01:11 -0700 +Subject: [PATCH] examples: Initialize child_idx + +Assign UINT_MAX and assert it + +Fixes warning +rtree_map.c:358:12: error: 'child_idx' may be used uninitialized +in this function [-Werror=maybe-uninitialized] + +Upstream-Status: Submitted [https://github.com/pmem/pmdk/pull/4802] +Signed-off-by: Khem Raj +--- + src/examples/libpmemobj/tree_map/rtree_map.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/examples/libpmemobj/tree_map/rtree_map.c b/src/examples/libpmemobj/tree_map/rtree_map.c +index 995e22bb9..6b3ead65c 100644 +--- a/src/examples/libpmemobj/tree_map/rtree_map.c ++++ b/src/examples/libpmemobj/tree_map/rtree_map.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -320,12 +321,13 @@ has_only_one_child(TOID(struct tree_map_node) node, unsigned *child_idx) + static void + remove_extra_node(TOID(struct tree_map_node) *node) + { +- unsigned child_idx; ++ unsigned child_idx = UINT_MAX; + TOID(struct tree_map_node) tmp, tmp_child; + + /* Our node has child with only one child. */ + tmp = *node; + has_only_one_child(tmp, &child_idx); ++ assert(child_idx != UINT_MAX); + tmp_child = D_RO(tmp)->slots[child_idx]; + + /* +-- +2.26.2 + diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch deleted file mode 100644 index ca2a1f6430..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 231eb4c75fbfaaf90bca7702bdaf55cf701a3527 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Mon, 23 Jul 2018 11:23:39 -0700 -Subject: [PATCH] jemalloc/jemalloc.cfg: Specify the host when building - jemalloc - -To avoid this error: - configure: error: cannot run C compiled programs. - If you meant to cross compile, use `--host'. -when cross compiling specify the host when configuring jemalloc. - -Signed-off-by: Alistair Francis -Upstream-Status: Inappropriate [configuration] ---- - src/jemalloc/jemalloc.cfg | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/jemalloc/jemalloc.cfg b/src/jemalloc/jemalloc.cfg -index 196129de6..79ebbab1c 100644 ---- a/src/jemalloc/jemalloc.cfg -+++ b/src/jemalloc/jemalloc.cfg -@@ -3,3 +3,4 @@ - --with-private-namespace=je_vmem_ - --disable-xmalloc - --disable-munmap -+--host=${HOST_SYS} --- -2.14.4 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch deleted file mode 100644 index 33f25b6a6b..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7d0732d69a774e28bc46b8b487d9f61bdd8afbff Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 6 Oct 2019 18:15:44 -0700 -Subject: [PATCH] os_posix: Use __FreeBSD__ to control secure_getenv definition - -__USE_GNU does not cover all Linux platforms, e.g. when using musl as C -library, __USE_GNU may not be defined but it does provide secure_getenv -so instead of narrowing the else condition, lets speicifically check for -FreeBSD being the platform, since that seems to be the intention here -anyway - -Upstream-Status: Submitted [https://github.com/pmem/pmdk/pull/3999] -Signed-off-by: Khem Raj ---- - src/common/os_posix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/common/os_posix.c b/src/common/os_posix.c -index a9a37ef84..052db2383 100644 ---- a/src/common/os_posix.c -+++ b/src/common/os_posix.c -@@ -346,7 +346,7 @@ os_setenv(const char *name, const char *value, int overwrite) - /* - * secure_getenv -- provide GNU secure_getenv for FreeBSD - */ --#ifndef __USE_GNU -+#if defined(__FreeBSD__) - static char * - secure_getenv(const char *name) - { --- -2.23.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb deleted file mode 100644 index f5066da0d8..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Persistent Memory Development Kit" -DESCRIPTION = "Persistent Memory Development Kit" -HOMEPAGE = "http://pmem.io" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7db1106255a1baa80391fd2e21eebab7" -DEPENDS = "ndctl" - -# Required to have the fts.h header for musl -DEPENDS_append_libc-musl = " fts" - -S = "${WORKDIR}/git" - -SRC_URI = "git://github.com/pmem/pmdk.git \ - file://0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch \ - file://0002-Makefile-Don-t-install-the-docs.patch \ - file://0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch \ - " - -SRCREV = "bc5e309485df61c452d08367e4b13ba9dfed5071" - -inherit autotools-brokensep pkgconfig - -# Fix jemalloc error: -# | configure: error: cannot run C compiled programs. -# | If you meant to cross compile, use `--host'. -# -# Also fix #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] -EXTRA_OEMAKE = "BUILD_EXAMPLES='n' HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}' LIB_PREFIX=${baselib}" - -# Fix the missing fts libs when using musl -EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'" - -do_install() { - oe_runmake prefix=${prefix} DESTDIR=${D} install - - # Remove uneeded files - rm -rf ${D}/usr/${baselib}/pmdk_debug -} - -# Include these by default otherwise the SDK is not very useful -FILES_${PN} += "${bindir}/pmempool ${bindir}/daxio" -FILES_${PN} += "${libdir}/*so*" -FILES_${PN} += "${libdir}/pkgconfig/*.pc" -FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/* /usr/*/include/" -FILES_${PN} += "/usr/etc" -FILES_${PN} += "/usr/share" - -COMPATIBLE_HOST='(x86_64).*' diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.8.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.8.bb new file mode 100644 index 0000000000..fe7b760e22 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.8.bb @@ -0,0 +1,52 @@ +SUMMARY = "Persistent Memory Development Kit" +DESCRIPTION = "Persistent Memory Development Kit" +HOMEPAGE = "http://pmem.io" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1b8430f251523f1bff0c9fb95da7e0ca" +DEPENDS = "ndctl" + +# Required to have the fts.h header for musl +DEPENDS_append_libc-musl = " fts" + +S = "${WORKDIR}/git" + +SRC_URI = "git://github.com/pmem/pmdk.git \ + file://0001-examples-Initialize-child_idx.patch \ + file://0002-Makefile-Don-t-install-the-docs.patch \ + " + +SRCREV = "0245d75eaf0f6106c86a7926a45fdf2149e37eaa" + +inherit autotools-brokensep pkgconfig + +# Fix jemalloc error: +# | configure: error: cannot run C compiled programs. +# | If you meant to cross compile, use `--host'. +# +# Also fix #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] +EXTRA_OEMAKE = "BUILD_EXAMPLES='n' HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}' LIB_PREFIX=${baselib}" + +# Fix the missing fts libs when using musl +EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'" + +do_configure_prepend() { + touch .skip-doc +} + +do_install() { + oe_runmake prefix=${prefix} DESTDIR=${D} install + + # Remove uneeded files + rm -rf ${D}/usr/${baselib}/pmdk_debug +} + +# Include these by default otherwise the SDK is not very useful +FILES_${PN} += "${bindir}/pmempool ${bindir}/daxio" +FILES_${PN} += "${libdir}/*so*" +FILES_${PN} += "${libdir}/pkgconfig/*.pc" +FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/* /usr/*/include/" +FILES_${PN} += "/usr/etc" +FILES_${PN} += "/usr/share" + +COMPATIBLE_HOST='(x86_64).*' diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb deleted file mode 100644 index ffd46da0af..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "A shared storage lock manager" -DESCRIPTION = "sanlock is a lock manager built on shared storage. Hosts with access \ -to the storage can perform locking. An application running on the \ -hosts is given a small amount of space on the shared block device or \ -file, and uses sanlock for its own application-specific synchronization. \ -Internally, the sanlock daemon manages locks using two disk-based \ -lease algorithms: delta leases and paxos leases." -HOMEPAGE = "https://pagure.io/sanlock" -SECTION = "utils" - -LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://../README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" - -PV .= "+git${SRCPV}" - -SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ - file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch;patchdir=../ \ - " -SRCREV = "cff348800722f7dadf030ffe7494c2df714996e3" - -S = "${WORKDIR}/git/python" - -DEPENDS = "libaio util-linux" - -inherit distutils3 useradd - -do_configure[noexec] = "1" - -do_compile_prepend () { - oe_runmake -C ${S}/../wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}" - oe_runmake -C ${S}/../src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}" -} - -do_install_prepend () { - oe_runmake -C ${S}/../wdmd DESTDIR=${D} LIBDIR=${libdir} install - oe_runmake -C ${S}/../src DESTDIR=${D} LIBDIR=${libdir} install -} - -SANLOCKGROUP ?= "sanlock" -SANLOCKUSER ?= "sanlock" -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system ${SANLOCKGROUP}" -USERADD_PARAM_${PN} = "--system -g ${SANLOCKGROUP} -G disk \ - --home-dir /run/${SANLOCKUSER} --no-create-home \ - --shell /sbin/nologin ${SANLOCKUSER}" diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.1.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.1.bb new file mode 100644 index 0000000000..abae362522 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.1.bb @@ -0,0 +1,45 @@ +SUMMARY = "A shared storage lock manager" +DESCRIPTION = "sanlock is a lock manager built on shared storage. Hosts with access \ +to the storage can perform locking. An application running on the \ +hosts is given a small amount of space on the shared block device or \ +file, and uses sanlock for its own application-specific synchronization. \ +Internally, the sanlock daemon manages locks using two disk-based \ +lease algorithms: delta leases and paxos leases." +HOMEPAGE = "https://pagure.io/sanlock" +SECTION = "utils" + +LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" +LIC_FILES_CHKSUM = "file://../README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" + +PV .= "+git${SRCPV}" + +SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ + file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch;patchdir=../ \ + " +SRCREV = "07ab65afb10c8f8c008880a73b7b7aaedbde0e15" + +S = "${WORKDIR}/git/python" + +DEPENDS = "libaio util-linux" + +inherit distutils3 useradd + +do_configure[noexec] = "1" + +do_compile_prepend () { + oe_runmake -C ${S}/../wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}" + oe_runmake -C ${S}/../src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}" +} + +do_install_prepend () { + oe_runmake -C ${S}/../wdmd DESTDIR=${D} LIBDIR=${libdir} install + oe_runmake -C ${S}/../src DESTDIR=${D} LIBDIR=${libdir} install +} + +SANLOCKGROUP ?= "sanlock" +SANLOCKUSER ?= "sanlock" +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system ${SANLOCKGROUP}" +USERADD_PARAM_${PN} = "--system -g ${SANLOCKGROUP} -G disk \ + --home-dir /run/${SANLOCKUSER} --no-create-home \ + --shell /sbin/nologin ${SANLOCKUSER}" -- cgit v1.2.3