heierbtc/mynode
1
0
Fork 1
mirror of https://github.com/mynodebtc/mynode.git synced 2025-01-11 11:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix seed gen issue by using specific grpcio version on RP4 32-bit

Browse Source
This commit is contained in:
Taylor Helsper 2021-12-16 23:30:02 -06:00
parent f145b5e1b3
commit c5b1431be9
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rootfs/standard/usr/bin/mynode_post_upgrade.sh
View File

@ -198,6 +198,11 @@ if ! skip_base_upgrades ; then
pip3 install lnd-grpc gnureadline docker-compose pipenv bcrypt pysocks redis --no-cache-dir
pip3 install flask pam python-bitcoinrpc prometheus_client psutil transmissionrpc qrcode image --no-cache-dir
# For RP4 32-bit, install specific grpcio version known to build (uses proper glibc for wheel)
if [ $IS_32_BIT = 1 ]; then
pip3 install grpcio==$PYTHON_ARM32_GRPCIO_VERSION grpcio-tools==$PYTHON_ARM32_GRPCIO_VERSION
fi
# Update Node
if [ -f /etc/apt/sources.list.d/nodesource.list ]; then
CURRENT_NODE_VERSION=$(cat /etc/apt/sources.list.d/nodesource.list)
@ -638,7 +643,7 @@ if should_install_app "joininbox" ; then
# Use Python3.7 on RP4 32-bit
JM_ENV_VARS=""
if [ $IS_64_BIT = 0 ]; then
if [ $IS_32_BIT = 1 ]; then
JM_ENV_VARS="export JM_PYTHON=python3.7; "
fi

2
rootfs/standard/usr/share/mynode/mynode_app_versions.sh
View File

@ -140,6 +140,8 @@ WEBSSH2_LATEST_VERSION_FILE=/mnt/hdd/mynode/settings/webssh2_version_latest
# Dependency versions
PYTHON_VERSION="3.8.9"
PYTHON_ARM32_GRPCIO_VERSION="1.40.0"
NODE_JS_VERSION="14.x"
NODE_NPM_VERSION="^8.1.0"

4
rootfs/standard/usr/share/mynode/mynode_config.sh
View File

@ -9,6 +9,7 @@ IS_RASPI3=0
IS_RASPI4=0
IS_RASPI4_ARM64=0
IS_X86=0
IS_32_BIT=0
IS_64_BIT=0
DEVICE_TYPE="unknown"
MODEL=$(tr -d '\0' < /proc/device-tree/model) || MODEL="unknown"
@ -24,12 +25,15 @@ elif [[ $MODEL == *"RockPro64"* ]]; then
elif [[ $MODEL == *"Raspberry Pi 3"* ]]; then
IS_RASPI=1
IS_RASPI3=1
IS_32_BIT=1
elif [[ $MODEL == *"Raspberry Pi 4"* ]]; then
IS_RASPI=1
IS_RASPI4=1
IS_32_BIT=1
UNAME=$(uname -a)
if [[ $UNAME == *"aarch64"* ]]; then
IS_RASPI4_ARM64=1
IS_32_BIT=0
IS_64_BIT=1
fi
fi

11
setup/setup_device.sh
View File

@ -23,6 +23,7 @@ IS_RASPI3=0
IS_RASPI4=0
IS_RASPI4_ARM64=0
IS_X86=0
IS_32_BIT=0
IS_64_BIT=0
IS_UNKNOWN=0
DEVICE_TYPE="unknown"
@ -39,12 +40,15 @@ elif [[ $MODEL == *"RockPro64"* ]]; then
elif [[ $MODEL == *"Raspberry Pi 3"* ]]; then
IS_RASPI=1
IS_RASPI3=1
IS_32_BIT=1
elif [[ $MODEL == *"Raspberry Pi 4"* ]]; then
IS_RASPI=1
IS_RASPI4=1
IS_32_BIT=1
UNAME=$(uname -a)
if [[ $UNAME == *"aarch64"* ]]; then
IS_RASPI4_ARM64=1
IS_32_BIT=0
IS_64_BIT=1
fi
fi
@ -275,6 +279,11 @@ pip3 install --upgrade pip wheel setuptools
pip3 install lnd-grpc gnureadline docker-compose pipenv bcrypt pysocks redis --no-cache-dir
pip3 install flask pam python-bitcoinrpc prometheus_client psutil transmissionrpc qrcode image --no-cache-dir
# For RP4 32-bit, install specific grpcio version known to build (uses proper glibc for wheel)
if [ $IS_32_BIT = 1 ]; then
pip3 install grpcio==$PYTHON_ARM32_GRPCIO_VERSION grpcio-tools==$PYTHON_ARM32_GRPCIO_VERSION
fi
# Install node
if [ ! -f /tmp/installed_node ]; then
@ -629,7 +638,7 @@ if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then
# Use Python3.7 on RP4 32-bit
JM_ENV_VARS=""
if [ $IS_64_BIT = 0 ]; then
if [ $IS_32_BIT = 1 ]; then
JM_ENV_VARS="export JM_PYTHON=python3.7; "
fi