diff options
author | Memphiz <memphis@machzwo.de> | 2016-05-19 17:07:46 +0200 |
---|---|---|
committer | Christian Fetzer <fetzer.ch@gmail.com> | 2016-05-19 20:23:14 +0200 |
commit | 1a7b241037e91cb4f85df9ea0fa34b4b5b0efc0d (patch) | |
tree | 214cc4d52c5bb28cd3cfd11d5479831e8e46897b /tools | |
parent | 08a58cb6008e2e460cf862dbb5793d70ef07b67b (diff) |
- only use fakeroot if SIP (System Intgrity Protection) is disabled (it prevents fakeroot et al - fall back to sudo in that case) - also remove the libfauxsu approach as it has the same SIP problem and is unused since fakeroot was added
Diffstat (limited to 'tools')
-rw-r--r-- | tools/darwin/packaging/ios/mkdeb-ios.sh.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/darwin/packaging/ios/mkdeb-ios.sh.in b/tools/darwin/packaging/ios/mkdeb-ios.sh.in index e84a321548..b1ba3bede9 100644 --- a/tools/darwin/packaging/ios/mkdeb-ios.sh.in +++ b/tools/darwin/packaging/ios/mkdeb-ios.sh.in @@ -41,10 +41,11 @@ if [ ! -d $APP ]; then echo "@APP_NAME@.app not found! are you sure you built $1 target?" exit 1 fi -if [ -f "${XBMC_DEPENDS_ROOT}/buildtools-native/bin/fakeroot" ]; then + +# also check for SIP (System Integrity Protection) here (via csrutil) - fakeroot et al are not working when it is enabled +# fall back to oldschool sudo in that case +if [ -f "${XBMC_DEPENDS_ROOT}/buildtools-native/bin/fakeroot" -a "`csrutil status | grep enabled`"x == "x" ]; then SUDO="${XBMC_DEPENDS_ROOT}/buildtools-native/bin/fakeroot" -elif [ -f "/usr/libexec/fauxsu/libfauxsu.dylib" ]; then - export DYLD_INSERT_LIBRARIES=/usr/libexec/fauxsu/libfauxsu.dylib elif [ -f "/usr/bin/sudo" ]; then SUDO="/usr/bin/sudo" fi |