0001-hgfsmounter-Makefile.am-support-usrmerge.patch 1.1 KB

123456789101112131415161718192021222324252627282930313233
  1. From 33798f3e484ebd3470e9da791b73b4b90ba12bc3 Mon Sep 17 00:00:00 2001
  2. From: Yi Zhao <yi.zhao@windriver.com>
  3. Date: Tue, 14 Jan 2020 15:04:03 +0800
  4. Subject: [PATCH] hgfsmounter/Makefile.am: support usrmerge
  5. There is a do_package error when enable usrmerge feature due to the
  6. hardcoded sbin directory. Remove this piece of code because we already
  7. create the symbolic link in do_install.
  8. Upstream-Status: Inappropriate [oe-specific]
  9. Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  10. ---
  11. open-vm-tools/hgfsmounter/Makefile.am | 3 ---
  12. 1 file changed, 3 deletions(-)
  13. diff --git a/open-vm-tools/hgfsmounter/Makefile.am b/open-vm-tools/hgfsmounter/Makefile.am
  14. index 7c1ba1a..58bd3f8 100644
  15. --- a/open-vm-tools/hgfsmounter/Makefile.am
  16. +++ b/open-vm-tools/hgfsmounter/Makefile.am
  17. @@ -39,9 +39,6 @@ uninstall-hook:
  18. rm -f $(DESTDIR)$(sbindir)/mount_vmhgfs
  19. else
  20. install-exec-hook:
  21. - -$(MKDIR_P) $(DESTDIR)/sbin
  22. - -$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
  23. - $(DESTDIR)/sbin/mount.vmhgfs &> /dev/null
  24. uninstall-hook:
  25. rm -f $(DESTDIR)/sbin/mount.vmhgfs
  26. endif !FREEBSD
  27. --
  28. 2.7.4