From 8d20a8d76d3c157d7941d566e7287ce4bceb4f30 Mon Sep 17 00:00:00 2001 From: DiMartinoXBMC Date: Fri, 31 Jul 2015 17:35:50 +0300 Subject: [PATCH] arm fix --- platform_pulsar.py | 16 +++++++++------- resources/language/english/strings.xml | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/platform_pulsar.py b/platform_pulsar.py index 4997d98..c35400e 100644 --- a/platform_pulsar.py +++ b/platform_pulsar.py @@ -13,7 +13,7 @@ except: def get_libname(platform): libname=[] - if platform['system'] in ['darwin', 'linux_x86', 'linux_armv6', 'linux_armv7', 'linux_x86_64']: + if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_armv6', 'linux_armv7', 'linux_x86_64']: libname=['libtorrent.so'] elif platform['system'] == 'windows': libname=['libtorrent.pyd'] @@ -44,10 +44,10 @@ def get_platform(): ret["arch"] = "x64" elif system==3: ret["os"] = "linux" - ret["arch"] = "arm" + ret["arch"] = "armv7" elif system==4: ret["os"] = "linux" - ret["arch"] = "arm" + ret["arch"] = "armv6" elif system==5: ret["os"] = "android" ret["arch"] = "arm" @@ -75,12 +75,14 @@ def get_platform(): ret["arch"] = "arm" elif xbmc.getCondVisibility("system.platform.linux"): ret["os"] = "linux" - if "arm" in os.uname()[4]: - ret["arch"] = "arm" - if "arm7" in os.uname()[4]: + uname=os.uname()[4] + if "arm" in uname: + if "armv7" in uname: ret["arch"] = "armv7" - elif "arm6" in os.uname()[4]: + elif "armv6" in uname: ret["arch"] = "armv6" + else: + ret["arch"] = "arm" elif xbmc.getCondVisibility("system.platform.windows"): ret["os"] = "windows" elif xbmc.getCondVisibility("system.platform.osx"): diff --git a/resources/language/english/strings.xml b/resources/language/english/strings.xml index daed105..d05449c 100644 --- a/resources/language/english/strings.xml +++ b/resources/language/english/strings.xml @@ -10,8 +10,8 @@ Windows 32-bit, 64-bit Linux 32-bit - Linux 64-bit (not ready) - Linux ARM v7 (RPi 2, not ready) + Linux 64-bit + Linux ARM v7 (RPi 2) Linux ARM v6 (RPi, not ready) Android ARM v7 Android 32-bit