Drop custom-built armv7 wrapper.

Tanuki-built arm wrapper works on armv5 and armv7 but not on Raspberry Pi armv6.
Wrapper we built for Raspberry Pi does not work on Trimslice armv7.
This commit is contained in:
zzz
2012-12-11 19:27:56 +00:00
parent 1fa00a5738
commit 60718dbf72
7 changed files with 17 additions and 6 deletions

View File

@@ -1,3 +1,12 @@
2012-12-11 zzz
* Wrapper: Use Tanuki's binary for armv7
2012-12-08 zzz
* susimail: Button CSS tweak
2012-12-07 zzz
* RouterClock: Reduce log level (ticket #790)
2012-12-05 zzz 2012-12-05 zzz
* GarlicMessage: Fix notes and log in GarlicMessageHandler and HandleGarlicMessageJob, * GarlicMessage: Fix notes and log in GarlicMessageHandler and HandleGarlicMessageJob,
they are used for netdb messages received by floodfills http://zzz.i2p/topics/1282 they are used for netdb messages received by floodfills http://zzz.i2p/topics/1282
@@ -266,7 +275,7 @@
* configlogging.jsp: Fix IAE * configlogging.jsp: Fix IAE
* error500.jsp: Fix whitespace * error500.jsp: Fix whitespace
* i2psnark: * i2psnark:
- Add allocating and checking indications - Add allocating and checking indications (ticket #695)
- Add bandwidth message at startup - Add bandwidth message at startup
- More checks at torrent creation - More checks at torrent creation
* SSU: * SSU:

View File

@@ -12,15 +12,15 @@ to xxx/librapper.so, libwrapper.jnilib, or wrapper.dll for the following directo
Don't forget to disable the execute bit. Don't forget to disable the execute bit.
linux (x86-32) linux (x86-32)
linux64 (x86-64) linux64 (x86-64)
linux-armv5 (armv5) linux-armv5 (armv5/armv7)
solaris (sparc-32) solaris (sparc-32)
From the delta pack, strip the binaries in bin/ and copy From the delta pack, strip the binaries in bin/ and copy
to xxx/i2psvc for the same directories as above. to xxx/i2psvc for the same directories as above.
Don't forget to disable the execute bit. Don't forget to disable the execute bit.
For armv7, build from source following the instructions For armv6, build from source following the instructions
in linux-armv7/README.txt. in linux-armv6/README.txt.
Don't forget to strip the binaries and disable the execute bit. Don't forget to strip the binaries and disable the execute bit.
We use a trimslice for armv7 building. We use a trimslice for armv7 building.

View File

@@ -40,8 +40,10 @@ X86_64=`echo "${OS_ARCH}" | grep x86_64`
case $HOST_OS in case $HOST_OS in
debian | fedora | gentoo | linux | mandrake | redhat | suse ) debian | fedora | gentoo | linux | mandrake | redhat | suse )
# Tanuki-built arm wrapper works on armv5 and armv7 but not on Raspberry Pi armv6.
# Wrapper we built for Raspberry Pi does not work on Trimslice armv7.
if [ `echo $OS_ARCH |grep armv7` ]; then if [ `echo $OS_ARCH |grep armv7` ]; then
wrapperpath="./lib/wrapper/linux-armv7" wrapperpath="./lib/wrapper/linux-armv5"
cp ${wrapperpath}/libwrapper.so ./lib/ cp ${wrapperpath}/libwrapper.so ./lib/
elif [ `echo $OS_ARCH |grep armv6` ]; then elif [ `echo $OS_ARCH |grep armv6` ]; then
wrapperpath="./lib/wrapper/linux-armv6" wrapperpath="./lib/wrapper/linux-armv6"

View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 13; public final static long BUILD = 14;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";