From a98d521006b52a5df4e3389860d66f1dcc5764de Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 26 Jul 2011 21:59:59 +0000
Subject: [PATCH]   * Installer: The previous wrapper files only work on armv7

---
 history.txt                                         |   1 +
 .../wrapper/{linux-arm => linux-armv7}/README.txt   |   0
 .../lib/wrapper/{linux-arm => linux-armv7}/i2psvc   | Bin
 .../{linux-arm => linux-armv7}/libwrapper.so        | Bin
 installer/resources/postinstall.sh                  |   7 +++++--
 5 files changed, 6 insertions(+), 2 deletions(-)
 rename installer/lib/wrapper/{linux-arm => linux-armv7}/README.txt (100%)
 rename installer/lib/wrapper/{linux-arm => linux-armv7}/i2psvc (100%)
 rename installer/lib/wrapper/{linux-arm => linux-armv7}/libwrapper.so (100%)

diff --git a/history.txt b/history.txt
index 6c15ed79f0..d207ca1e95 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,5 @@
 2011-07-26 zzz
+  * Installer: The previous wrapper files only work on armv7
   * NetDB:
     - Explore even more aggressively at startup
     - Increase SingleSearchJob timeout
diff --git a/installer/lib/wrapper/linux-arm/README.txt b/installer/lib/wrapper/linux-armv7/README.txt
similarity index 100%
rename from installer/lib/wrapper/linux-arm/README.txt
rename to installer/lib/wrapper/linux-armv7/README.txt
diff --git a/installer/lib/wrapper/linux-arm/i2psvc b/installer/lib/wrapper/linux-armv7/i2psvc
similarity index 100%
rename from installer/lib/wrapper/linux-arm/i2psvc
rename to installer/lib/wrapper/linux-armv7/i2psvc
diff --git a/installer/lib/wrapper/linux-arm/libwrapper.so b/installer/lib/wrapper/linux-armv7/libwrapper.so
similarity index 100%
rename from installer/lib/wrapper/linux-arm/libwrapper.so
rename to installer/lib/wrapper/linux-armv7/libwrapper.so
diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh
index c0abd50c9a..4345fbe842 100644
--- a/installer/resources/postinstall.sh
+++ b/installer/resources/postinstall.sh
@@ -40,8 +40,11 @@ X86_64=`echo "${OS_ARCH}" | grep x86_64`
 
 case $HOST_OS in
     debian | fedora | gentoo | linux | mandrake | redhat | suse )
-	if [ `echo $OS_ARCH |grep arm` ]; then
-            wrapperpath="./lib/wrapper/linux-arm"
+        if [ `echo $OS_ARCH |grep armv7` ]; then
+            wrapperpath="./lib/wrapper/linux-armv7"
+            cp ${wrapperpath}/libwrapper.so ./lib/
+        elif [ `echo $OS_ARCH |grep arm` ]; then
+            wrapperpath="./lib/wrapper/linux-armv5"
             cp ${wrapperpath}/libwrapper.so ./lib/
         elif [ "X$X86_64" = "X" ]; then
             wrapperpath="./lib/wrapper/linux"