meta-openembedded: subtree update:ea8604a0e3..d0748372d2

Adrian Bunk (1):
      libnih: Remove

Alexander Kanavin (3):
      sysprof: add a recipe from oe-core
      sysprof: update to 3.34.1
      sysprof: fix ARM builds

Andreas Müller (2):
      evolution-data-server: remove pythonnative from inherit
      fontforge: rework for python3

Diego Rondini (2):
      cups-filters: use libexecdir and cleanup
      cups-filters: upgrade 1.26.0 -> 1.26.2

Gianfranco Costamagna (2):
      websocketpp: refresh clang patch
      vboxguestdrivers: update to new version 6.1.2

Khem Raj (14):
      sysprof: avoid namesapace conflict with glibc headers
      jack: Use c++ compiler for programs which use c++ source files
      iozone3: Do not define prototype for pread64()
      libhugetlbfs: Fix missing file mode in create() API
      rdma-core: Use overloadable attribute with clang
      sysprof: Correct systemdunitdir location
      opencv: Tend for the compiler --param option rename in gcc10
      grpc: Link with libatomic on powerpc
      ssiapi: Needs boost/ppc support
      fluentbit: Fix build on powerpc
      mozjs: extend --with-intl-api=build to ppc
      mpv: Disable lua support on powerpc
      packagegroup-meta-oe: Remove unbuildable recipes for ppc64le from rdeps
      opensc: Upgrade to 0.20.0

Mingde (Matthew) Zeng (2):
      byacc: upgrade 20191103 -> 20191125
      keyutils: upgrade 1.6 -> 1.6.1

Peter Kjellerstedt (1):
      gitpkgv.bbclass: Add support for extending the supported tag formats

S. Lockwood-Childs (1):
      lcov: geninfo needs another perl module

Wang Mingyu (15):
      python3-cheetah: upgrade 3.2.3 -> 3.2.4
      python3-coverage: 4.4.2 -> 5.0.2
      python3-keras-applications: upgrade 1.0.6 -> 1.0.8
      python3-keras-preprocessing: upgrade 1.0.5 -> 1.1.0
      python3-more-itertools: 7.2.0 -> 8.1.0
      python3-multidict: 4.5.2 -> 4.7.4
      python3-ordered-set: 3.0.1 -> 3.1.1
      python3-pulsectl: upgrade 18.12.5 -> 20.1.2
      python-cmd2: upgrade 0.9.22 -> 0.9.23
      python-engineio: upgrade 3.11.1 -> 3.11.2
      python-javaobj-py3: upgrade 0.3.0 -> 0.4.0.1
      python-kconfiglib: upgrade 10.42.0 -> 13.7.0
      python-packaging: 19.2 -> 20.0
      python-periphery: 2.0.0 -> 2.0.1
      python-pyrsistent: upgrade 0.15.5 -> 0.15.7

William A. Kennington III via Openembedded-devel (1):
      cppzmq: bump to version 4.6.0

Yi Zhao (3):
      crda: fix UDEV_RULE_DIR
      open-vm-tools: fix build error with usrmerge feature
      multipath-tools: fix libudevdir

Zang Ruochen (14):
      dhcpcd: upgrade 8.1.1 -> 8.1.5
      fio: upgrade 3.16 -> 3.17
      libencode-perl: upgrade 3.01 -> 3.02
      zabbix: modify service file
      libmicrohttpd: upgrade 0.9.68 -> 0.9.69
      libsass: upgrade 3.6.1 -> 3.6.3
      pcsc-lite: upgrade 1.8.25 -> 1.8.26
      python3-yarl: upgrade 1.3.0 -> 1.4.2
      python3-wheel: upgrade 0.32.3 -> 0.33.6
      python3-websockets: upgrade 8.0.2 -> 8.1
      python-wcwidth: upgrade 0.1.7 -> 0.1.8
      python-waitress: upgrade 1.4.1 -> 1.4.2
      python-tqdm: upgrade 4.38.0 -> 4.41.1
      python-supervisor: upgrade 4.0.2 -> 4.1.0

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

2 files changed, 40 insertions, 2 deletions

diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-hgfsmounter-Makefile.am-support-usrmerge.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-hgfsmounter-Makefile.am-support-usrmerge.patch
new file mode 100644
index 000000000..82443ee66
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-hgfsmounter-Makefile.am-support-usrmerge.patch
@@ -0,0 +1,33 @@
+From 33798f3e484ebd3470e9da791b73b4b90ba12bc3 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Tue, 14 Jan 2020 15:04:03 +0800
+Subject: [PATCH] hgfsmounter/Makefile.am: support usrmerge
+
+There is a do_package error when enable usrmerge feature due to the
+hardcoded sbin directory. Remove this piece of code because we already
+create the symbolic link in do_install.
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ open-vm-tools/hgfsmounter/Makefile.am | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/open-vm-tools/hgfsmounter/Makefile.am b/open-vm-tools/hgfsmounter/Makefile.am
+index 7c1ba1a..58bd3f8 100644
+--- a/open-vm-tools/hgfsmounter/Makefile.am
++++ b/open-vm-tools/hgfsmounter/Makefile.am
+@@ -39,9 +39,6 @@ uninstall-hook:
+ 	rm -f $(DESTDIR)$(sbindir)/mount_vmhgfs
+ else
+ install-exec-hook:
+-	-$(MKDIR_P) $(DESTDIR)/sbin
+-	-$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
+-		$(DESTDIR)/sbin/mount.vmhgfs &> /dev/null
+ uninstall-hook:
+ 	rm -f $(DESTDIR)/sbin/mount.vmhgfs
+ endif !FREEBSD
+-- 
+2.7.4
+
diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb
index eda77c206..34a81d21f 100644
--- a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb
+++ b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb
@@ -42,6 +42,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \
     file://0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch;patchdir=.. \
     file://0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \
     file://0001-utilBacktrace-Ignore-Warray-bounds.patch;patchdir=.. \
+    file://0001-hgfsmounter-Makefile.am-support-usrmerge.patch;patchdir=.. \
 "
 
 SRCREV = "d3edfd142a81096f9f58aff17d84219b457f4987"
@@ -60,7 +61,8 @@ SYSTEMD_SERVICE_${PN} = "vmtoolsd.service"
 EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \
          --disable-tests --without-gtkmm --without-xerces --without-pam \
          --disable-vgauth --disable-deploypkg \
-         --without-root-privileges --without-kernel-modules --with-tirpc"
+         --without-root-privileges --without-kernel-modules --with-tirpc \
+         --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d"
 
 NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3"
 X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf"
@@ -83,7 +85,10 @@ CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf"
 RDEPENDS_${PN} = "util-linux libdnet fuse"
 
 do_install_append() {
-    ln -sf ${sbindir}/mount.vmhgfs ${D}/sbin/mount.vmhgfs
+    if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
+        install -d ${D}/sbin
+        ln -sf ${sbindir}/mount.vmhgfs ${D}/sbin/mount.vmhgfs
+    fi
     install -d ${D}${sysconfdir}/vmware-tools
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -d ${D}${systemd_unitdir}/system