diff options
| author | Simon Rettberg | 2013-05-24 19:13:40 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-05-24 19:13:40 +0200 |
| commit | 5377c4e1125828fc32d47b2d075812eabe2ca496 (patch) | |
| tree | 61ee3294ee4dbf61a2af273c8058c1aadf1e7cf2 /remote/modules/vmplayer | |
| parent | Joeys Mist wieder fixen :P (diff) | |
| download | tm-scripts-5377c4e1125828fc32d47b2d075812eabe2ca496.tar.gz tm-scripts-5377c4e1125828fc32d47b2d075812eabe2ca496.tar.xz tm-scripts-5377c4e1125828fc32d47b2d075812eabe2ca496.zip | |
[vmplayer] Copy kernel modules in post_copy, not build
[systemd] enable logind again, fixes tty2-6
Diffstat (limited to 'remote/modules/vmplayer')
| -rw-r--r-- | remote/modules/vmplayer/vmplayer.build | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index 5747e611..70143a7e 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -31,10 +31,10 @@ build() { cp -r ./src/vmware-vmx/lib/{bin,icu,lib,libconf,scripts} "$TARGET" || perror "Could not copy many things from vmware-vmx." [ ! -L "$TARGET/bin/vmplayer" ] && { ln -s /usr/lib/vmware/bin/appLoader "$TARGET/bin/vmplayer" || perror "Could not link vmplayer to appLoader."; } chmod +x "$TARGET"/bin/* - chmod u+s "$TARGET"/bin/vmware-vmx* + chmod u+s "$TARGET"/bin/vmware-vmx* || perror "Error setting suid-bit on vmware-vmx*" chmod +x "$MODULE_BUILD_DIR"/usr/{bin,sbin}/* - chmod u+s "$MODULE_BUILD_DIR"/usr/bin/vmware-mount - chmod u+s "$MODULE_BUILD_DIR"/usr/sbin/vmware-authd + chmod u+s "$MODULE_BUILD_DIR"/usr/bin/vmware-mount || perror "Error setting suid-bit on vmware-mount" + chmod u+s "$MODULE_BUILD_DIR"/usr/sbin/vmware-authd || perror "Error setting suid-bit on vmware-authd" chmod +x "$TARGET"/lib/*.sh find "$MODULE_BUILD_DIR" -name '*.sh' -exec chmod +x {} \; for file in $(grep -rl -E "^#!/" "$MODULE_BUILD_DIR"); do @@ -65,9 +65,10 @@ post_copy() { gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/" || pwarning "update-icon-cache-3.0 failed." #fix vmware-usbarbotrator bug date +'%Y.%m.%d' >"${TARGET_BUILD_DIR}/etc/arch-release" + copy_modules } -build_modules(){ +build_modules() { pdebug "PAtCHIGN" # need to be in src cd "$MODULE_DIR/src" || perror "Could not cd to '$MODULE_DIR/src'" @@ -139,9 +140,14 @@ EOF cd - - mkdir -p "$TARGET_BUILD_DIR/lib/modules/vmware/" - cp "/lib/modules/$UTS_RELEASE/vmplayer/"* "$TARGET_BUILD_DIR/lib/modules/vmware/" || perror "Could not cp vmware modules to target!" [ -e /etc/vmware/config ] && rm -f /etc/vmware/config cp /etc/vmware/config.mltk.bak /etc/vmware/config } + +function copy_modules() { + local UTS_RELEASE="$(cat "$MODULES_DIR/kernel/ksrc/include/generated/utsrelease.h" | awk -F '"' '{print $2}')" + mkdir -p "$TARGET_BUILD_DIR/lib/modules/vmware/" + cp "/lib/modules/$UTS_RELEASE/vmplayer/"* "$TARGET_BUILD_DIR/lib/modules/vmware/" || perror "Could not cp vmware modules to target!" +} + |