Changeset ab44488


Ignore:
Timestamp:
Jun 13, 2014 8:55:36 PM (6 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
002d057
Parents:
653ffbc
Message:

i2prouter: don't use uname -p to determine the arch

  • This came from the script from Tanuki but it does return useful information (as far as its use in the script) in my testing. uname -m is better for our needs. (The problem is only seen on certain CPUs when *all* available wrapper binaries are present and the script tries to resolve the correct binary to use..
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/0001-path-substitution.patch

    r653ffbc rab44488  
    148148 then
    149149     COMMAND="$FIXED_COMMAND"
    150 @@ -1023,7 +947,6 @@
     150@@ -1014,7 +938,6 @@
    151151         if [ "X$pid" = "X" ]
    152152         then
     
    156156             eval echo ' running: PID:$pid'
    157157         fi
    158 @@ -1826,7 +1749,7 @@
     158@@ -1817,7 +1740,7 @@
    159159 }
    160160 
     
    165165 
    166166 checkifstartingasroot() {
    167 @@ -1834,7 +1757,7 @@
     167@@ -1825,7 +1748,7 @@
    168168         echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
    169169         showsetusermesg
     
    174174     fi
    175175 }
    176 @@ -1899,24 +1822,10 @@
     176@@ -1890,24 +1813,10 @@
    177177             status
    178178             ;;
  • installer/resources/i2prouter

    r653ffbc rab44488  
    405405    APP_PLIST=${APP_PLIST_BASE}.plist
    406406else
    407     DIST_ARCH=
    408     DIST_ARCH=`uname -p 2>/dev/null | $TREXE "[A-Z]" "[a-z]" | $TREXE -d ' '`
    409     if [ "X$DIST_ARCH" = "X" ]
    410     then
    411         DIST_ARCH="unknown"
    412     fi
    413     if [ "$DIST_ARCH" = "unknown" ]
    414     then
    415         DIST_ARCH=`uname -m 2>/dev/null | $TREXE "[A-Z]" "[a-z]" | $TREXE -d ' '`
    416     fi
     407    DIST_ARCH=`uname -m 2>/dev/null | $TREXE "[A-Z]" "[a-z]" | $TREXE -d ' '`
    417408    case "$DIST_ARCH" in
    418409        'athlon' | 'i386' | 'i486' | 'i586' | 'i686')
     
    480471            ;;
    481472        armv*)
    482             if [ -z "`readelf -A /proc/self/exe | grep Tag_ABI_VFP_args`" ] ; then 
     473            if [ -z "`readelf -A /proc/self/exe | grep Tag_ABI_VFP_args`" ] ; then
    483474                DIST_ARCH="armel"
    484475                DIST_BITS="32"
    485             else 
     476            else
    486477                DIST_ARCH="armhf"
    487478                DIST_BITS="32"
Note: See TracChangeset for help on using the changeset viewer.