From 8501dc084246e1f90f1822b7f6b30c09c6d8c99c Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Fri, 23 Jun 2017 15:48:47 -0700 Subject: open-vm-tools: fix all hardcoded paths Signed-off-by: Martin Kelly Signed-off-by: Martin Jansa --- .../recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-oe/recipes-support/open-vm-tools') diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb index 4ab2820c1c..2a83e864f7 100644 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb @@ -56,15 +56,15 @@ PACKAGECONFIG[fuse] = ",,fuse" CFLAGS += "-Wno-error=deprecated-declarations" FILES_${PN} += "\ - /usr/lib/open-vm-tools/plugins/vmsvc/lib*.so \ - /usr/lib/open-vm-tools/plugins/common/lib*.so \ + ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \ + ${libdir}/open-vm-tools/plugins/common/lib*.so \ ${sysconfdir}/vmware-tools/tools.conf \ " -FILES_${PN}-locale += "/usr/share/open-vm-tools/messages" -FILES_${PN}-dev += "/usr/lib/open-vm-tools/plugins/common/lib*.la" +FILES_${PN}-locale += "${datadir}/open-vm-tools/messages" +FILES_${PN}-dev += "${libdir}/open-vm-tools/plugins/common/lib*.la" FILES_${PN}-dbg += "\ - /usr/lib/open-vm-tools/plugins/common/.debug \ - /usr/lib/open-vm-tools/plugins/vmsvc/.debug \ + ${libdir}/open-vm-tools/plugins/common/.debug \ + ${libdir}/open-vm-tools/plugins/vmsvc/.debug \ " CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf" @@ -72,7 +72,7 @@ CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf" RDEPENDS_${PN} = "util-linux libdnet fuse" do_install_append() { - ln -sf /usr/sbin/mount.vmhgfs ${D}/sbin/mount.vmhgfs + ln -sf ${sbindir}/mount.vmhgfs ${D}/sbin/mount.vmhgfs install -d ${D}${systemd_unitdir}/system ${D}${sysconfdir}/vmware-tools install -m 644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf -- cgit 1.2.3-korg