echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2prouter: add amdfx* as an x64 CPU / move ldd check

Browse Source
This commit is contained in:
kytv
2014-06-12 00:41:14 +00:00
parent ed85a2b82b
commit e968828916
2 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
debian/patches/0001-path-substitution.patch vendored
View File

@ -71,7 +71,7 @@ Debian wrapper.config to try to prevent confusion.
# Priority at which to run the wrapper. See "man nice" for valid priorities. # Priority at which to run the wrapper. See "man nice" for valid priorities.
# nice is only used if a priority is specified. # nice is only used if a priority is specified.
@@ -172,84 +163,8 @@ @@ -172,75 +163,8 @@
exit 1 exit 1
fi fi
@ -144,19 +144,10 @@ Debian wrapper.config to try to prevent confusion.
- exit 1 - exit 1
-} -}
- -
-if $(which ldd > /dev/null 2>&1); then
- # This should cover every *NIX other than OSX since OSX doesn't have ldd.
- # OSX has otool. Is otool on every OSX installation? Is otool's output the same as ldd's?
- # The wrapper we ship for OSX are for PPC and Intel, so maybe we don't need to worry about OSX?
- if (ldd "$WRAPPER_CMD" |grep -q 'not found') > /dev/null 2>&1 || \
- ! (ldd "$WRAPPER_CMD" > /dev/null 2>&1); then
- failed
- fi
-fi
if [ -n "$FIXED_COMMAND" ] if [ -n "$FIXED_COMMAND" ]
then then
@@ -1022,7 +937,6 @@ COMMAND="$FIXED_COMMAND"
@@ -1023,7 +947,6 @@
if [ "X$pid" = "X" ] if [ "X$pid" = "X" ]
then then
eval echo " `gettext 'WARNING: $APP_LONG_NAME may have failed to start.'`" eval echo " `gettext 'WARNING: $APP_LONG_NAME may have failed to start.'`"
@ -164,7 +155,7 @@ Debian wrapper.config to try to prevent confusion.
else else
eval echo ' running: PID:$pid' eval echo ' running: PID:$pid'
fi fi
@@ -1825,7 +1739,7 @@ @@ -1826,7 +1749,7 @@
} }
showsetusermesg() { showsetusermesg() {
@ -173,7 +164,7 @@ Debian wrapper.config to try to prevent confusion.
} }
checkifstartingasroot() { checkifstartingasroot() {
@@ -1833,7 +1747,7 @@ @@ -1834,7 +1757,7 @@
echo "`gettext 'Running I2P as the root user is *not* recommended.'`" echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
showsetusermesg showsetusermesg
echo echo
@ -182,7 +173,7 @@ Debian wrapper.config to try to prevent confusion.
exit 1 exit 1
fi fi
} }
@@ -1898,24 +1812,10 @@ @@ -1899,24 +1822,10 @@
status status
;; ;;

23
installer/resources/i2prouter
View File

@ -241,16 +241,6 @@ failed() {
exit 1 exit 1
} }
if $(which ldd > /dev/null 2>&1); then
# This should cover every *NIX other than OSX since OSX doesn't have ldd.
# OSX has otool. Is otool on every OSX installation? Is otool's output the same as ldd's?
# The wrapper we ship for OSX are for PPC and Intel, so maybe we don't need to worry about OSX?
if (ldd "$WRAPPER_CMD" |grep -q 'not found') > /dev/null 2>&1 || \
! (ldd "$WRAPPER_CMD" > /dev/null 2>&1); then
failed
fi
fi
if [ -n "$FIXED_COMMAND" ] if [ -n "$FIXED_COMMAND" ]
then then
COMMAND="$FIXED_COMMAND" COMMAND="$FIXED_COMMAND"
@ -433,7 +423,7 @@ else
DIST_BITS="32" DIST_BITS="32"
fi fi
;; ;;
'amd64' | 'x86_64') amdfx* | 'amd64' | 'x86_64')
DIST_ARCH="x86" DIST_ARCH="x86"
DIST_BITS="64" DIST_BITS="64"
;; ;;
@ -613,6 +603,17 @@ if [ ! -r "${WRAPPER_CMD}" ]; then
exit 1 exit 1
fi fi
if $(which ldd > /dev/null 2>&1); then
# This should cover every *NIX other than OSX since OSX doesn't have ldd.
# OSX has otool. Is otool on every OSX installation? Is otool's output the same as ldd's?
# The wrapper we ship for OSX are for PPC and Intel, so maybe we don't need to worry about OSX?
if (ldd "$WRAPPER_CMD" |grep -q 'not found') > /dev/null 2>&1 || \
! (ldd "$WRAPPER_CMD" > /dev/null 2>&1); then
failed
fi
fi
# Build the nice clause # Build the nice clause
if [ "X$PRIORITY" = "X" ] if [ "X$PRIORITY" = "X" ]
then then