diff --git a/bin/install_hyperion.sh b/bin/install_hyperion.sh index 5e8c0c8f..0d3b4f72 100755 --- a/bin/install_hyperion.sh +++ b/bin/install_hyperion.sh @@ -31,8 +31,8 @@ OS_OSMC=`grep -m1 -c OSMC /etc/issue` CPU_RPI=`grep -m1 -c 'BCM2708\|BCM2709\|BCM2710' /proc/cpuinfo` CPU_IMX6=`grep -m1 -c i.MX6 /proc/cpuinfo` CPU_WETEK=`grep -m1 -c Amlogic /proc/cpuinfo` -CPU_X64=`uname -m | grep x86_64 | wc -l` -CPU_X32=`uname -m | grep 'x86_32\|i686' | wc -l` +CPU_X32X64=`uname -m | grep 'x86_32\|i686\|x86_64' | wc -l` +#CPU_X32=`uname -m | grep 'x86_32\|i686' | wc -l` # Check that we have a known configuration if [ $CPU_RPI -ne 1 ] && [ $CPU_IMX6 -ne 1 ] && [ $CPU_WETEK -ne 1 ] && [ $CPU_X64 -ne 1 ] && [ $CPU_X32 -ne 1 ]; then echo '---> Critical Error: CPU information does not match any known releases -> abort' @@ -117,12 +117,12 @@ elif [ $CPU_IMX6 -eq 1 ]; then elif [ $CPU_WETEK -eq 1 ]; then HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_wetek.tar.gz OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz -elif [ $CPU_X64 -eq 1 ]; then - HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_x64.tar.gz - OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-x32x64.tar.gz -elif [ $CPU_X32 -eq 1 ]; then - HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_x32.tar.gz +elif [ $CPU_X32X64 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_x32x64.tar.gz OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-x32x64.tar.gz +#elif [ $CPU_X32 -eq 1 ]; then +# HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_x32.tar.gz +# OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-x32x64.tar.gz else echo "---> Critical Error: Target platform unknown -> abort" exit 1 diff --git a/deploy/hyperion_rpi.tar.gz.REMOVED.git-id b/deploy/hyperion_rpi.tar.gz.REMOVED.git-id index 07cce7ce..df62cd1b 100644 --- a/deploy/hyperion_rpi.tar.gz.REMOVED.git-id +++ b/deploy/hyperion_rpi.tar.gz.REMOVED.git-id @@ -1 +1 @@ -465b3cbd6542aab5424b4ef47089cb92137a0af2 \ No newline at end of file +63bda72fdb3fb504564f067795f74e9b45eb99ba \ No newline at end of file diff --git a/deploy/hyperion_wetek.tar.gz.REMOVED.git-id b/deploy/hyperion_wetek.tar.gz.REMOVED.git-id index 01df1168..9cc7dee0 100644 --- a/deploy/hyperion_wetek.tar.gz.REMOVED.git-id +++ b/deploy/hyperion_wetek.tar.gz.REMOVED.git-id @@ -1 +1 @@ -752ebb4ffc19892d1c99af0993913eb922195e38 \ No newline at end of file +03e78585af86a18889ecd1d8b910d76155608cd6 \ No newline at end of file diff --git a/deploy/hyperion_x32.tar.gz.REMOVED.git-id b/deploy/hyperion_x32.tar.gz.REMOVED.git-id deleted file mode 100644 index cb027877..00000000 --- a/deploy/hyperion_x32.tar.gz.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -f7b19344829d6df11bd624bbf722a5d8ec6b1dbe \ No newline at end of file diff --git a/deploy/hyperion_x32x64.tar.gz.REMOVED.git-id b/deploy/hyperion_x32x64.tar.gz.REMOVED.git-id new file mode 100644 index 00000000..d2485017 --- /dev/null +++ b/deploy/hyperion_x32x64.tar.gz.REMOVED.git-id @@ -0,0 +1 @@ +9a00f3dc5684cab0fede56348df91c046634ff11 \ No newline at end of file diff --git a/deploy/hyperion_x64.tar.gz.REMOVED.git-id b/deploy/hyperion_x64.tar.gz.REMOVED.git-id deleted file mode 100644 index 0f7275da..00000000 --- a/deploy/hyperion_x64.tar.gz.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -294f14bdc79d9d8306432681bf3c8468a4097a48 \ No newline at end of file