summaryrefslogtreecommitdiffstats
path: root/remote/modules
diff options
context:
space:
mode:
authorChristian Rößler2014-03-24 15:54:51 +0100
committerChristian Rößler2014-03-24 15:54:51 +0100
commit18149cac0b4b9523ca0a71a982a2bfa1ed2fa018 (patch)
treed183b1a1f4e9373875880537549993350826be81 /remote/modules
parent[vmware.build] Ahem, forgot to re-comment debugging bash (diff)
downloadtm-scripts-18149cac0b4b9523ca0a71a982a2bfa1ed2fa018.tar.gz
tm-scripts-18149cac0b4b9523ca0a71a982a2bfa1ed2fa018.tar.xz
tm-scripts-18149cac0b4b9523ca0a71a982a2bfa1ed2fa018.zip
[vmware, chroot] vmware pseudo-deletions in case workstation is installed in
the base system. An explicit warning for chroot.inc's autoexec.bat.
Diffstat (limited to 'remote/modules')
-rw-r--r--remote/modules/vmware/vmware.build9
1 files changed, 7 insertions, 2 deletions
diff --git a/remote/modules/vmware/vmware.build b/remote/modules/vmware/vmware.build
index c1dd77ce..b4baf9c2 100644
--- a/remote/modules/vmware/vmware.build
+++ b/remote/modules/vmware/vmware.build
@@ -21,6 +21,10 @@ fetch_source() {
}
build() {
+ local DELETE_FILES
+ local OLDIFS="$IFS"
+ DELETE_FILES=$(for LINE in $REQUIRED_VMWARE_DELETIONS;do echo rm -rf $LINE; done)
+
# prepare the build directory with the files needed during the chroot
cp "${MODULE_DIR}/src/$VMWARE_BUNDLE_FILE" "${MODULE_BUILD_DIR}/$VMWARE_BUNDLE_FILE"
cp -r "${MODULE_DIR}/patches" "${MODULE_BUILD_DIR}"
@@ -28,9 +32,10 @@ build() {
pinfo "Installing vmware per chroot..."
chroot_run "${MODULE_BUILD_DIR}" <<-EOF
# PS1='\[\e[1;33m\](chroot) \u@\h:\w\$ \[\e[1;32m\]' /bin/bash -norc # un-comment for debugging within chroot
+ $DELETE_FILES
yes | sh /"${VMWARE_BUNDLE_FILE}" --eulas-agreed --console --required
- vmware-modconfig --console --build-mod -k "${SYS_UTS_RELEASE}" vmnet $(which gcc) "${MODULES_DIR}"/kernel/ksrc/include/ vmplayer vmnet
- vmware-modconfig --console --build-mod -k "${SYS_UTS_RELEASE}" vmmon $(which gcc) "${MODULES_DIR}"/kernel/ksrc/include/ vmplayer vmmon
+ vmware-modconfig --console --build-mod -k "${SYS_UTS_RELEASE}" vmnet $(which gcc) "${KERNEL_HEADERS_PATH}/include" vmplayer vmnet
+ vmware-modconfig --console --build-mod -k "${SYS_UTS_RELEASE}" vmmon $(which gcc) "${KERNEL_HEADERS_PATH}/include" vmplayer vmmon
# PS1='\[\e[1;33m\](chroot) \u@\h:\w\$ \[\e[1;32m\]' /bin/bash -norc # un-comment for debugging within chroot
EOF