From e0c5e1796640e568df065e1b3abceae0f344d164 Mon Sep 17 00:00:00 2001 From: Taylor Helsper Date: Tue, 11 May 2021 23:38:47 -0500 Subject: [PATCH] Upgrade Python to 3.7.9; Add python lzma; Use mariadb for mempool on RP4 64-bit --- rootfs/standard/usr/bin/mynode_post_upgrade.sh | 4 ++-- rootfs/standard/usr/bin/mynode_startup.sh | 2 +- setup/setup_device.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rootfs/standard/usr/bin/mynode_post_upgrade.sh b/rootfs/standard/usr/bin/mynode_post_upgrade.sh index 07d13ca5..bf92f225 100755 --- a/rootfs/standard/usr/bin/mynode_post_upgrade.sh +++ b/rootfs/standard/usr/bin/mynode_post_upgrade.sh @@ -112,7 +112,7 @@ if ! skip_base_upgrades ; then $TORIFY apt-get -y install xorg chromium openbox lightdm openjdk-11-jre libevent-dev ncurses-dev $TORIFY apt-get -y install libudev-dev libusb-1.0-0-dev python3-venv gunicorn sqlite3 libsqlite3-dev $TORIFY apt-get -y install torsocks python3-requests libsystemd-dev libjpeg-dev zlib1g-dev psmisc - $TORIFY apt-get -y install hexyl libbz2-dev + $TORIFY apt-get -y install hexyl libbz2-dev liblzma-dev # Install device specific packages if [ $IS_X86 = 1 ]; then @@ -137,7 +137,7 @@ if ! skip_base_upgrades ; then # Update Python3 to 3.7.X - PYTHON_VERSION=3.7.8 + PYTHON_VERSION=3.7.9 CURRENT_PYTHON3_VERSION=$(python3 --version) if [[ "$CURRENT_PYTHON3_VERSION" != *"Python ${PYTHON_VERSION}"* ]]; then mkdir -p /opt/download diff --git a/rootfs/standard/usr/bin/mynode_startup.sh b/rootfs/standard/usr/bin/mynode_startup.sh index 4c83b91d..b4422a7a 100755 --- a/rootfs/standard/usr/bin/mynode_startup.sh +++ b/rootfs/standard/usr/bin/mynode_startup.sh @@ -511,7 +511,7 @@ fi if [ -f /mnt/hdd/mynode/mempool/.env ]; then sed -i "s/VERSION=.*/VERSION=$MEMPOOL_VERSION/g" /mnt/hdd/mynode/mempool/.env fi -if [ $IS_RASPI -eq 1 ]; then +if [ $IS_RASPI -eq 1 ] && [ $IS_RASPI4_ARM64 -eq 0 ]; then sed -i "s|MARIA_DB_IMAGE=.*|MARIA_DB_IMAGE=hypriot/rpi-mysql:latest|g" /mnt/hdd/mynode/mempool/.env fi diff --git a/setup/setup_device.sh b/setup/setup_device.sh index b7e16bb2..5b8aa738 100755 --- a/setup/setup_device.sh +++ b/setup/setup_device.sh @@ -175,7 +175,7 @@ apt -y -qq install apt-transport-https ca-certificates apt-get -y install xorg chromium openbox lightdm openjdk-11-jre libevent-dev ncurses-dev apt-get -y install zlib1g-dev libudev-dev libusb-1.0-0-dev python3-venv gunicorn apt-get -y install sqlite3 libsqlite3-dev torsocks python3-requests libsystemd-dev -apt-get -y install libjpeg-dev zlib1g-dev psmisc hexyl libbz2-dev +apt-get -y install libjpeg-dev zlib1g-dev psmisc hexyl libbz2-dev liblzma-dev # Install device specific packages if [ $IS_X86 = 1 ]; then @@ -218,7 +218,7 @@ pip2 install tzupdate virtualenv pysocks redis qrcode image subprocess32 # Update Python3 to 3.7.X -PYTHON_VERSION=3.7.8 +PYTHON_VERSION=3.7.9 CURRENT_PYTHON3_VERSION=$(python3 --version) if [[ "$CURRENT_PYTHON3_VERSION" != *"Python ${PYTHON_VERSION}"* ]]; then mkdir -p /opt/download