mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

open-vm-tools: fix build error with usrmerge feature

Browse Source 
* Pass --with-udev-rules-dir to configure.
* Only create the symbolic link of mount.vmhgfs when disable usrmerge
  feature.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
2020-01-14 16:36:42 +08:00
committed by Khem Raj
parent d5e2cb3845
commit ffb4a46e1a
2 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-hgfsmounter-Makefile.am-support-usrmerge.patch
+33
View File
@@ -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
meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb
+7 -2
View File
@@ -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