瀏覽代碼

Added proper JamVM wrapper

Added -Xnoinlining to option as a workaround for a hardened
compilation-related issue.
Maxim Kammerer 14 年之前
父節點
當前提交
e783c86578
共有 3 個文件被更改,包括 7 次插入4 次删除
  1. 2 2
      src/root/setup
  2. 2 2
      src/root/setup-copy
  3. 3 0
      src/usr/local/libexec/java.wrapper

+ 2 - 2
src/root/setup

@@ -525,8 +525,8 @@ chattr -f -a /tmp/.private || true
 
 sinfo "Installing wrappers"
 mv -n /sbin/iwconfig{,.orig}
-ln -sf /usr/local/libexec/iwconfig.wrapper       /sbin/iwconfig
-ln -sf /usr/local/libexec/vmmouse_detect.wrapper /usr/bin/vmmouse_detect
+ln -sf ../usr/local/libexec/iwconfig.wrapper   /sbin/iwconfig
+ln -sf ../local/libexec/vmmouse_detect.wrapper /usr/bin/vmmouse_detect
 
 
 sinfo "Compiling kernel"

+ 2 - 2
src/root/setup-copy

@@ -411,8 +411,8 @@ rc-update -u
 
 
 sinfo "Setting sh (dash) and java (jamvm) symlinks"
-ln -sf dash  /bin/sh
-ln -s  jamvm /usr/bin/java
+ln -sf dash                          /bin/sh
+ln -s  ../local/libexec/java.wrapper /usr/bin/java
 
 
 # Spaces in entries are not handled, but it doesn't matter here

+ 3 - 0
src/usr/local/libexec/java.wrapper

@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+exec /usr/bin/jamvm -Xnoinlining "$@"