meta-openembedded: subtree update:6a5d6bc9ad..3061ead8cf

Adrian Bunk (2):
      gpsd: gpscat no longer uses python-curses in 3.19
      dejagnu: Remove, moved to oe-core

Alex Kiernan (1):
      zstd: Upgrade 1.4.2 -> 1.4.3

Alistair Francis (2):
      python3-twine: Initial commit of 1.13.0
      python3-pytest-asyncio: Initial commit of 0.10.0

Andreas Müller (4):
      fluidsynth: upgrade 2.0.5 -> 2.0.6
      imsettings: upgrade 1.7.3 -> 1.8.1 and rework recipe
      xfce4-settings: upgrade 4.14.0 -> 4.14.1
      xfce4-screenshooter: upgrade 1.9.5 -> 1.9.6

Andrej Valek (1):
      nodejs: 10.16.2 -> 10.16.3

Changqing Li (7):
      yail: update UPSTREAM_CHECK_GITTAGREGEX
      iscsi-initiator-utils: 2.0.876 -> 2.0.877
      postgresql: 11.4 -> 11.5
      satyr: upgrade 0.27 -> 0.28
      freeradius: upgrade 3.0.17 -> 3.0.19
      drbd-utils: switch to add patch from change source in do_configure
      xfsdump: support usrmerge

Gianfranco Costamagna (2):
      grpc: don't use unexisting gettid function on glibc 2.29, it has been implemented only in 2.30
      grpc: Change gettid patch with the upstream merged version

Hongxu Jia (1):
      lvm2: fix blkdeactivate failed with command not found

Kai Kang (4):
      lmbench: update script lmbench-run
      mariadb: fix file conflictions when multilib enabled
      php: sync with apache2's change
      apache2: fix multilib file conflicts

Khem Raj (11):
      iperf2: Fix build with latest libc++
      iscsi-initiator-utils: Inherit pkgconfig and override PKG_CONFIG
      klibc: Fix build with 5.2+ kernel headers
      samba: Fix configure tests to work with clang
      ltrace: Fix build on mips
      python-jinja2: Make asyncio specific to python3 module alone
      python3-cmd2: Add to blacklist
      nodejs: Mark incompatible with risc-v
      drbd,netkit-rusers: Blacklist packages
      vboxguestdrivers,can-isotp,bpftool: Add to Blacklist
      strongswan: Fix do_patch fuzz

Li Zhou (1):
      tipcutils: ptts: Set recv buffer size to max to receive as many packets as possible

Martin Jansa (1):
      python3-pyatspi: restrict with GTK2DISTROFEATURES

Oleksandr Kravchuk (1):
      nano: update to 4.4

Qi.Chen@windriver.com (2):
      python-hyperlink: rdepend on python-idna
      python-jinja2: rdepend on asyncio module

Robert Yang (1):
      netcf: Fix do_configure failed when multilib

Scott Ellis (1):
      wireguard: Upgrade 20190702 to 20190905

Yuan Chao (10):
      strongswan: upgrade 5.8.0 -> 5.8.1
      php: upgrade 7.3.8 -> 7.3.9
      libtalloc: upgrade 2.2.0 -> 2.3.0
      numactl: upgrade 2.0.12 -> 2.0.13
      uhubctl: upgrade 2.0.0 -> 2.1.0
      python-pytest: upgrade 5.1.1 -> 5.1.2
      python-stevedore: upgrade 1.30.1 -> 1.31.0
      python-dbus: upgrade 1.2.8 -> 1.2.10
      python-pbr: upgrade 5.4.2 -> 5.4.3
      python-pyasn1: upgrade 0.4.6 -> 0.4.7

Zang Ruochen (3):
      python-paste: upgrade 3.1.1 -> 3.2.0
      libnet-dns-perl: upgrade 1.20 -> 1.21
      hwdata: upgrade 0.326 -> 0.327

Zheng Ruoqin (1):
      python-cmd2: Add python3 version

aehs29@gmail.com (1):
      remmina: Add recipe for the remmina remote desktop client

Change-Id: I11f4319f53655ab389fcb7a0ce4f22b71f9a8da2
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

2 files changed, 80 insertions, 1 deletions

diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch
new file mode 100644
index 000000000..16de8c0a1
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch
@@ -0,0 +1,73 @@
+From 27b56cb6b5dfc75ea8ddb395dc9ef41fb7a09c93 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Mon, 2 Sep 2019 23:04:50 -0400
+Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found
+
+In oe-core (util-linux and coreutils), the commands locates in
+${bindir} rather than /bin, add BINDIR to configure it
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ configure.ac                | 3 +++
+ scripts/blkdeactivate.sh.in | 7 ++++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d1431e2..54e5a7b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1495,6 +1495,8 @@ fi
+ 
+ SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))"
+ 
++BINDIR="$(eval echo $(eval echo $bindir))"
++
+ SBINDIR="$(eval echo $(eval echo $sbindir))"
+ LVM_PATH="$SBINDIR/lvm"
+ AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.])
+@@ -1721,6 +1723,7 @@ AC_SUBST(SACKPT_CFLAGS)
+ AC_SUBST(SACKPT_LIBS)
+ AC_SUBST(SALCK_CFLAGS)
+ AC_SUBST(SALCK_LIBS)
++AC_SUBST(BINDIR)
+ AC_SUBST(SBINDIR)
+ AC_SUBST(SELINUX_LIBS)
+ AC_SUBST(SELINUX_PC)
+diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
+index a4b8a8f..3db4226 100644
+--- a/scripts/blkdeactivate.sh.in
++++ b/scripts/blkdeactivate.sh.in
+@@ -41,13 +41,14 @@ UMOUNT="/bin/umount"
+ 
+ sbindir="@SBINDIR@"
+ DMSETUP="$sbindir/dmsetup"
++bindir="@BINDIR@"
+ LVM="$sbindir/lvm"
+ 
+ if "$UMOUNT" --help | grep -- "--all-targets" >"$DEV_DIR/null"; then
+ 	UMOUNT_OPTS="--all-targets "
+ else
+ 	UMOUNT_OPTS=""
+-	FINDMNT="/bin/findmnt -r --noheadings -u -o TARGET"
++	FINDMNT="$bindir/findmnt -r --noheadings -u -o TARGET"
+ 	FINDMNT_READ="read -r mnt"
+ fi
+ DMSETUP_OPTS=""
+@@ -55,10 +56,10 @@ LVM_OPTS=""
+ MDADM_OPTS=""
+ MPATHD_OPTS=""
+ 
+-LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
++LSBLK="$bindir/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
+ LSBLK_VARS="local devtype local kname local name local mnt"
+ LSBLK_READ="read -r devtype kname name mnt"
+-SORT_MNT="/bin/sort -r -u -k 4"
++SORT_MNT="$bindir/sort -r -u -k 4"
+ 
+ # Do not show tool errors by default (only done/skipping summary
+ # message provided by this script) and no verbose mode by default.
+-- 
+2.8.1
+
diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb
index 785c6960e..f42bd8ed2 100644
--- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb
+++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb
@@ -4,6 +4,7 @@ SRCREV = "913c28917e62577a2ef67152b2e5159237503dda"
 
 SRC_URI += " \
             file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \
+            file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \
            "
 
 DEPENDS += "autoconf-archive-native"
@@ -67,7 +68,12 @@ RDEPENDS_${PN}-udevrules = "libdevmapper"
 RDEPENDS_${PN}_append_class-target = " libdevmapper"
 RDEPENDS_${PN}_append_class-nativesdk = " libdevmapper"
 
-RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) bash"
+RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \
+                          bash \
+                          util-linux-lsblk \
+                          util-linux-findmnt \
+                          coreutils \
+"
 RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})"
 
 CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf"