diff options
| author | Jonathan Bauer | 2017-11-21 12:57:45 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2017-11-21 12:57:45 +0100 |
| commit | be56e3cca67a4fd0b56d498ef7d68f3ee74da527 (patch) | |
| tree | 5eb218f0a81cfc48b42eb8b5debd6719e8190de4 /core/modules/vmware12 | |
| parent | [vmware12] fix vmplayer not finding its libs (diff) | |
| download | mltk-be56e3cca67a4fd0b56d498ef7d68f3ee74da527.tar.gz mltk-be56e3cca67a4fd0b56d498ef7d68f3ee74da527.tar.xz mltk-be56e3cca67a4fd0b56d498ef7d68f3ee74da527.zip | |
[vmware] mv libexpat.so.1 to libexpat.so.0 (...)
Diffstat (limited to 'core/modules/vmware12')
| -rw-r--r-- | core/modules/vmware12/module.build | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/core/modules/vmware12/module.build b/core/modules/vmware12/module.build index a89bdb0c..2160e5f7 100644 --- a/core/modules/vmware12/module.build +++ b/core/modules/vmware12/module.build @@ -141,8 +141,6 @@ build() { vmware-modconfig --console --build-mod -k "${TARGET_KERNEL_LONG}" vmmon /bin/gccw "${KERNEL_HEADERS_DIR}/include" vmplayer vmmon || perror "vmmon build failed" EOF - cd "${MODULE_WORK_DIR}" || perror "Could not cd to '${MODULE_WORK_DIR}'" - # cleanup unneeded files rm -rf -- "${MODULE_BUILD_DIR}/etc/vmware-installer" rm -rf -- "${MODULE_BUILD_DIR}/usr/lib/vmware-installer" @@ -170,6 +168,22 @@ build() { installerDefaults.componentDownloadEnabled = "no" installerDefaults.dataCollectionEnabled = "no" HEREDOC + + # HACK: vmplayer 12.5.8 libfontconfig needs libexpat.so.0 but vmware ships with libexpat.so.1 + # To fix crashes, rename the shipped .1 lib to the expected .0 lib... + local SHIPPED_LIBEXPAT="libexpat.so.1" + if [ -f "${MODULE_BUILD_DIR}/usr/lib/vmware/lib/${SHIPPED_LIBEXPAT}/${SHIPPED_LIBEXPAT}" ]; then + mv "${MODULE_BUILD_DIR}/usr/lib/vmware/lib/${SHIPPED_LIBEXPAT}/${SHIPPED_LIBEXPAT}" \ + "${MODULE_BUILD_DIR}/usr/lib/vmware/lib/${SHIPPED_LIBEXPAT}/${SHIPPED_LIBEXPAT%?}0" || \ + perror "Failed to rename vmware's lib 'libexpat.so.1'." + mv "${MODULE_BUILD_DIR}/usr/lib/vmware/lib/${SHIPPED_LIBEXPAT}" \ + "${MODULE_BUILD_DIR}/usr/lib/vmware/lib/${SHIPPED_LIBEXPAT%?}0" || \ + perror "Failed to rename vmware's dir 'libexpat.so.1'." + elif [ -f "${MODULE_BUILD_DIR}/usr/lib/vmware/lib/${SHIPPED_LIBEXPAT%?}0/${SHIPPED_LIBEXPAT%?}0" ]; then + pnfo "Found '${MODULE_BUILD_DIR}/usr/lib/vmware/lib/${SHIPPED_LIBEXPAT%?}0/${SHIPPED_LIBEXPAT%?}0'" + else + pwarning "Could not find '${MODULE_BUILD_DIR}/usr/lib/vmware/lib/${SHIPPED_LIBEXPAT}'" + fi } post_copy() { |