mirrors/raspiblitz
1
0
Fork 0
mirror of https://github.com/rootzoll/raspiblitz.git synced 2024-11-19 01:40:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(deps): Bumps base image to bullseye (#2734)

Browse Source
This commit is contained in:
Götz Görisch 2021-12-09 18:18:58 +01:00 committed by rootzoll
parent 70a643b720
commit efbd67eac2
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build_sdcard.sh
View File

@ -1,9 +1,9 @@
#!/bin/bash
#########################################################################
# Build your SD card image based on:
# raspios_arm64-2020-08-24
# https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2021-04-09/
# SHA256: a30a3650c3ef22a69f6f025760c6b04611a5992961a8c2cd44468f1c429d68bb
# 2021-10-30-raspios-bullseye-arm64.zip
# https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2021-11-08/
# SHA256: b35425de5b4c5b08959aa9f29b9c0f730cd0819fe157c3e37c56a6d0c5c13ed8
##########################################################################
# setup fresh SD card with image above - login per SSH and run this script:
##########################################################################
@ -195,9 +195,8 @@ echo "*** Adding Tor Sources to sources.list ***"
torSourceListAvailable=$(sudo grep -c 'https://deb.torproject.org/torproject.org' /etc/apt/sources.list)
echo "torSourceListAvailable=${torSourceListAvailable}"
if [ ${torSourceListAvailable} -eq 0 ]; then
echo "- adding Tor sources ..."
if [ "${baseimage}" = "raspbian" ] || [ "${baseimage}" = "raspios_arm64" ] || \
[ "${baseimage}" = "armbian" ] || [ "${baseimage}" = "dietpi" ] || [ "${baseimage}" = "debian" ]; then
echo "- adding TOR sources ..."
if [ "${baseimage}" = "raspbian" ] || [ "${baseimage}" = "raspios_arm64" ] || [ "${baseimage}" = "armbian" ] || [ "${baseimage}" = "dietpi" ]; then
echo "- using https://deb.torproject.org/torproject.org bullseye"
echo "deb https://deb.torproject.org/torproject.org bullseye main" | sudo tee -a /etc/apt/sources.list
echo "deb-src https://deb.torproject.org/torproject.org bullseye main" | sudo tee -a /etc/apt/sources.list
@ -247,7 +246,7 @@ if [ "${baseimage}" = "raspbian" ] || [ "${baseimage}" = "dietpi" ] || \
fi
if [ ! -f /etc/apt/sources.list.d/raspi.list ]; then
echo "# Add the archive.raspberrypi.org/debian/ to the sources.list"
echo "deb http://archive.raspberrypi.org/debian/ buster main" | sudo tee /etc/apt/sources.list.d/raspi.list
echo "deb http://archive.raspberrypi.org/debian/ bullseye main" | sudo tee /etc/apt/sources.list.d/raspi.list
fi
fi
@ -259,19 +258,14 @@ sudo apt -y autoremove
echo
echo "*** Python DEFAULT libs & dependencies ***"
if [ -f "/usr/bin/python3.7" ]; then
# make sure /usr/bin/python exists (and calls Python3.7 in Buster)
sudo update-alternatives --install /usr/bin/python python /usr/bin/python3.7 1
echo "python calls python3.7"
elif [ -f "/usr/bin/python3.8" ]; then
# use python 3.8 if available
if [ -f "/usr/bin/python3.8" ]; then
# make sure /usr/bin/python exists (and calls Python3.7 in bullseye)
sudo update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1
sudo ln -s /usr/bin/python3.8 /usr/bin/python3.7
echo "python calls python3.8"
elif [ -f "/usr/bin/python3.9" ]; then
# use python 3.9 if available
sudo update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1
sudo ln -s /usr/bin/python3.9 /usr/bin/python3.7
sudo ln -s /usr/bin/python3.9 /usr/bin/python3.8
echo "python calls python3.9"
else
echo "!!! FAIL !!!"
@ -526,7 +520,7 @@ fi
# dependencies for python
sudo apt install -y python3-venv python3-dev python3-wheel python3-jinja2 python3-pip
# make sure /usr/bin/pip exists (and calls pip3 in Debian Buster)
# make sure /usr/bin/pip exists (and calls pip3 in Debian bullseye)
sudo update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1
# rsync is needed to copy from HDD