summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/modules/vmware12/module.build3
-rw-r--r--core/rootfs/rootfs-stage32/module.build2
-rw-r--r--core/rootfs/rootfs-stage32/module.conf1
3 files changed, 3 insertions, 3 deletions
diff --git a/core/modules/vmware12/module.build b/core/modules/vmware12/module.build
index b965d9cf..c7cc8c67 100644
--- a/core/modules/vmware12/module.build
+++ b/core/modules/vmware12/module.build
@@ -212,9 +212,6 @@ build() {
}
post_copy() {
- # FIXME: gconftool is copied without dependencies
- tarcopy "$(find /usr/lib/ /usr/lib64 -name gconv -type d)" "$TARGET_BUILD_DIR"
-
# Update Icon cache for vmplayer
gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/" || pwarning "update-icon-cache-3.0 failed."
diff --git a/core/rootfs/rootfs-stage32/module.build b/core/rootfs/rootfs-stage32/module.build
index 54200708..d9df3cba 100644
--- a/core/rootfs/rootfs-stage32/module.build
+++ b/core/rootfs/rootfs-stage32/module.build
@@ -64,6 +64,8 @@ build() {
[ ! -f ${FILE} ] && perror "Missing required file $FILE"
echo ${FILE} >> "${FILELIST}"
done
+ # Grab gconv .so files, required by vmware, mtools and maybe some more tools
+ find /usr/lib/ /usr/lib64 -name gconv -type d | grep -v debug >> "${FILELIST}"
local NUMFILES=$(cat "${FILELIST}" | wc -l)
if [ "x$NUMFILES" != "x" -a "x$NUMFILES" != "x0" ]; then
diff --git a/core/rootfs/rootfs-stage32/module.conf b/core/rootfs/rootfs-stage32/module.conf
index e56b1df0..41afc704 100644
--- a/core/rootfs/rootfs-stage32/module.conf
+++ b/core/rootfs/rootfs-stage32/module.conf
@@ -90,6 +90,7 @@ REQUIRED_FILES="
REQUIRED_DIRECTORIES="
/etc
/usr
+ /$LIB64
"
REQUIRED_KERNEL_MODULES="
kernel/drivers/cpufreq