Add support for ARM

mafredri · Oct 24, 2015 · 779c899 · 779c899
1 parent edfa06e
commit 779c899
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/pkgversions_arm.txt b/pkgversions_arm.txt
@@ -0,0 +1,7 @@
+# This file is auto-generated.
+dev-libs/boost-1.57.0
+dev-qt/qtcore-4.8.7-r1
+dev-qt/qtlockedfile-2.4.1_p20150629
+dev-qt/qtsingleapplication-2.6.1_p20150629
+net-libs/rb_libtorrent-1.0.6
+net-p2p/qbittorrent-3.2.3
diff --git a/pkgversions_i386.txt b/pkgversions_i386.txt
@@ -1,6 +1,6 @@
 # This file is auto-generated.
 dev-libs/boost-1.57.0
-dev-qt/qtcore-4.8.7
+dev-qt/qtcore-4.8.7-r1
 dev-qt/qtlockedfile-2.4.1_p20150629
 dev-qt/qtsingleapplication-2.6.1_p20150629
 net-libs/rb_libtorrent-1.0.6

diff --git a/setup.sh b/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-EIX="eix -*neI --format '<installedversions:NAMEVERSION>' -A"
+EIX="eix -\*neI --format '<installedversions:NAMEVERSION>' -A"
 
 ROOT=$(cd "$(dirname "${0}")" && pwd)
 VERSION=$(<version.txt)
@@ -12,6 +12,7 @@ MERGE=1
 ADM_ARCH=(
     "x86-64:/cross/x86_64-asustor-linux-gnu"
     "i386:/cross/i686-asustor-linux-gnu"
+    "arm:/cross/arm-marvell-linux-gnueabi"
 )
 
 # Set hostname (ssh) from where to fetch the files

diff --git a/source/CONTROL/changelog.txt b/source/CONTROL/changelog.txt
@@ -1,3 +1,6 @@
+3.2.3:
+- Add support for ARM
+
 3.2.3:
 - Updated qBittorrent to 3.2.3
 - Updated libtorrent rasterbar to 1.0.6

diff --git a/source/CONTROL/post-install.sh b/source/CONTROL/post-install.sh
@@ -6,10 +6,14 @@ else
 	PKG_DIR=$APKG_PKG_DIR
 fi
 
-if [ "$(uname -m)" = "x86_64" ]; then
-	AS_NAS_ARCH="x86-64"
+# Set the NAS ARCH variable
+arch=$(uname -m)
+if [ "$arch" = "x86_64" ]; then
+    AS_NAS_ARCH="x86-64"
+elif [ "$arch" = "armv7l" ]; then
+    AS_NAS_ARCH="arm"
 else
-	AS_NAS_ARCH="i386"
+    AS_NAS_ARCH="i386"
 fi
 
 . "${PKG_DIR}/CONTROL/env.sh"

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-3.2.3
+3.2.3-r1