Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SW-1938 Mrb3 image #97

Draft
wants to merge 37 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
b29b40d
set python3.10 for venvs
Josef-MrBeam Aug 26, 2022
8a32578
create python3.10 env
Josef-MrBeam Aug 26, 2022
7913b33
try to install python 3.10
Josef-MrBeam Aug 26, 2022
230a6d5
add apr-repository
Josef-MrBeam Aug 26, 2022
eec4a31
try toinstall python3.10
Josef-MrBeam Aug 26, 2022
be31781
add yes option
Josef-MrBeam Aug 26, 2022
fcdc030
try different way to install
Josef-MrBeam Aug 26, 2022
77ce976
try to fix ssh key problems
Josef-MrBeam Aug 26, 2022
44c0a6d
update python3 commands to python3.10 commands
Josef-MrBeam Aug 26, 2022
0938b76
add dev packaages
Josef-MrBeam Aug 31, 2022
c1387c1
force yes
Josef-MrBeam Aug 31, 2022
d35eb9a
force yes
Josef-MrBeam Aug 31, 2022
9835705
force yes
Josef-MrBeam Aug 31, 2022
73ea086
remove apt install
Josef-MrBeam Sep 1, 2022
cf1bee4
try to resolve python3.10 problem
Josef-MrBeam Sep 2, 2022
a1dd4b7
change install of python3
Josef-MrBeam Sep 2, 2022
8cb56df
fixed cleanup
Josef-MrBeam Sep 2, 2022
96eeb48
try to fix build error
Josef-MrBeam Sep 2, 2022
d3a5873
add virtualenv
Josef-MrBeam Sep 2, 2022
d83e140
fix virtual env
Josef-MrBeam Sep 2, 2022
851ab14
fix version
Josef-MrBeam Sep 2, 2022
cf7b83d
fix version
Josef-MrBeam Sep 2, 2022
f38721a
fix build problems
Josef-MrBeam Sep 2, 2022
e19d348
create mrb variant
Josef-MrBeam Sep 2, 2022
9285cf6
build image with oprint 1.7.3 (#98)
Josef-MrBeam Sep 2, 2022
e4867f3
fix virtual env of beamcheck
Josef-MrBeam Sep 2, 2022
bc18bc1
remove post update
Josef-MrBeam Sep 2, 2022
de8d26d
add bitbucket to ssh config
Josef-MrBeam Sep 5, 2022
2e2fabc
fix bitbucket key name
Josef-MrBeam Sep 6, 2022
14bbe67
fix iobeam clone
Josef-MrBeam Sep 6, 2022
3263931
dont' use new python 3 branch
Josef-MrBeam Sep 7, 2022
7003e25
-fix iobeam
Josef-MrBeam Sep 15, 2022
263c72d
oprint venv with python3
Josef-MrBeam Sep 16, 2022
55c79cd
use core plugin for mrb3 variant
Josef-MrBeam Sep 16, 2022
8e50ad5
-fixed link to opencv
Josef-MrBeam Oct 10, 2022
9ffe876
-add deploy keys
Josef-MrBeam Oct 19, 2022
8f93831
fix doc repo
Josef-MrBeam Oct 20, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
then
flavors='{"flavor":"alpha 2R"}'
else
flavors='{"flavor":"2R"}'
flavors='{"flavor":"mrb3 oprint173"}'
fi
echo "::set-output name=matrix::{\"include\":[$flavors]}"

Expand All @@ -50,7 +50,7 @@ jobs:
sudo apt update
sudo apt install coreutils p7zip-full qemu-user-static

- name: Configure SSH-Keys inside image
- name: Configure SSH-Keys for pipeline
env:
SSH_KEY_MOUNTMANAGER: ${{ secrets.DEPLOY_KEY_MOUNTMANAGER }}
SSH_KEY_MRBCHECK: ${{ secrets.DEPLOY_KEY_MRBCHECK }}
Expand All @@ -60,6 +60,7 @@ jobs:
echo "$SSH_KEY_BITBUCKET" > ~/.ssh/bitbucket.key
echo "$SSH_KEY_MOUNTMANAGER" > ~/.ssh/mountmanager.key
echo "$SSH_KEY_MRBCHECK" > ~/.ssh/mrbcheck.key

chmod 600 ~/.ssh/bitbucket.key
chmod 600 ~/.ssh/mountmanager.key
chmod 600 ~/.ssh/mrbcheck.key
Expand Down Expand Up @@ -120,6 +121,12 @@ jobs:
sudo modprobe loop
cd repository/src
echo "export EXTRA_SSH_KEY='${{ secrets.SSH_BEAMOS01_RSA }}'" >> config
echo "export SSH_KEY_MRB3_CORE_PLUGIN='${{ secrets.DEPLOY_KEY_MRB3_CORE_PLUGIN }}'" >> config
echo "export SSH_KEY_MRB3_FINDME_PLUGIN='${{ secrets.DEPLOY_KEY_MRB3_FINDME_PLUGIN }}'" >> config
echo "export SSH_KEY_MRB3_CONNECT_PLUGIN='${{ secrets.DEPLOY_KEY_MRB3_CONNECT_PLUGIN }}'" >> config
echo "export SSH_KEY_MRB3_CONNECT_DAEMON='${{ secrets.DEPLOY_KEY_MRB3_CONNECT_DAEMON }}'" >> config
echo "export SSH_KEY_MRB3_DOC='${{ secrets.DEPLOY_KEY_MRB3_DOC }}'" >> config
echo "export SSH_KEY_MRB3_HAL='${{ secrets.DEPLOY_KEY_MRB3_HAL }}'" >> config
sudo bash -x ./build_dist $VARIANT ${{ matrix.flavor }}

- name: Copy output
Expand Down
18 changes: 18 additions & 0 deletions src/modules/beamos/filesystem/home/pi/.ssh/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Host jackfan.us.kg-mrb3-core-plugin
HostName github.com
IdentityFile /home/pi/.ssh/mrb3-core-plugin
Host jackfan.us.kg-mrb3-findMe-plugin
HostName github.com
IdentityFile /home/pi/.ssh/mrb3-findMe-plugin
Host jackfan.us.kg-mrb3-connect-plugin
HostName github.com
IdentityFile /home/pi/.ssh/mrb3-connect-plugin
Host jackfan.us.kg-mrb3-connect-daemon
HostName github.com
IdentityFile /home/pi/.ssh/mrb3-connect-daemon
Host jackfan.us.kg-mrb3-doc
HostName github.com
IdentityFile /home/pi/.ssh/mrb3-doc
Host jackfan.us.kg-mrb3-hal
HostName github.com
IdentityFile /home/pi/.ssh/mrb3-hal
85 changes: 61 additions & 24 deletions src/modules/beamos/start_chroot_script
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ enable_hw_serial() {
add_mrb3() {
echo "--- Installing Python3"
# additional python3 packages (uncomment when needed +20sec)
apt-get -y install python3 python3-venv python3-dev
apt-get -y install python3.10 python3.10-venv python3.10-dev
# create mrb virtual environments
# TODO create mrb2 and mrb3 (python 2 and 3 versions)
sudo -u pi python3.7 -m venv /home/pi/mrb3
sudo -u pi python3.10 -m venv /home/pi/mrb3
}

OPRINT=/home/pi/oprint/bin

pip_install() {
PIP_DEFAULT_TIMEOUT=60 sudo -u pi $OPRINT/pip --disable-pip-version-check install $@
PIP_DEFAULT_TIMEOUT=60 sudo -u pi $OPRINT/pip3 --disable-pip-version-check install $@
}

pip_install_dev_or_rm() {
Expand Down Expand Up @@ -206,14 +206,15 @@ mv ./micro /usr/bin/
# Install a toml cli tool and neofetch presentation script
# Can be used to edit / query /etc/mrbeam `crudini --get /etc/mrbeam "" hostname`
apt-install python3-pip neofetch
python3 -m pip install crudini
python3.10 -m pip install crudini

mkdir -p /root/.ssh
# Add ssh creds to prevent errors when pulling from bitbucket
ssh-keyscan -t rsa bitbucket.org >> /root/.ssh/known_hosts

mkdir -p /home/pi/.ssh
ssh-keyscan -t rsa bitbucket.org >> /home/pi/.ssh/known_hosts
ssh-keyscan -t rsa github.com >> /home/pi/.ssh/known_hosts
chown 1000:1000 /home/pi/.ssh/known_hosts

# Enable ssh identification for private packages in bitbucket.org
Expand All @@ -224,12 +225,44 @@ if [ -n "$EXTRA_SSH_KEY" ]; then
chmod 0600 /root/.ssh/id_rsa
fi

if [ -n "$SSH_KEY_MRB3_CORE_PLUGIN" ]; then
echo "$SSH_KEY_MRB3_CORE_PLUGIN" > /home/pi/.ssh/mrb3-core-plugin
chmod 0600 /home/pi/.ssh/mrb3-core-plugin
chown pi:pi /home/pi/.ssh/mrb3-core-plugin
fi

if [ -n "$SSH_KEY_MRB3_FINDME_PLUGIN" ]; then
echo "$SSH_KEY_MRB3_FINDME_PLUGIN" > /home/pi/.ssh/mrb3-findMe-plugin
chmod 0600 /home/pi/.ssh/mrb3-findMe-plugin
chown pi:pi /home/pi/.ssh/mrb3-findMe-plugin
fi
if [ -n "$SSH_KEY_MRB3_CONNECT_PLUGIN" ]; then
echo "$SSH_KEY_MRB3_CONNECT_PLUGIN" > /home/pi/.ssh/mrb3-connect-plugin
chmod 0600 /home/pi/.ssh/mrb3-connect-plugin
chown pi:pi /home/pi/.ssh/mrb3-connect-plugin
fi
if [ -n "$SSH_KEY_MRB3_CONNECT_DAEMON" ]; then
echo "$SSH_KEY_MRB3_CONNECT_DAEMON" > /home/pi/.ssh/mrb3-connect-daemon
chmod 0600 /home/pi/.ssh/mrb3-connect-daemon
chown pi:pi /home/pi/.ssh/mrb3-connect-daemon
fi
if [ -n "$SSH_KEY_MRB3_DOC" ]; then
echo "$SSH_KEY_MRB3_DOC" > /home/pi/.ssh/mrb3-doc
chmod 0600 /home/pi/.ssh/mrb3-doc
chown pi:pi /home/pi/.ssh/mrb3-doc
fi
if [ -n "$SSH_KEY_MRB3_HAL" ]; then
echo "$SSH_KEY_MRB3_HAL" > /home/pi/.ssh/mrb3-hal
chmod 0600 /home/pi/.ssh/mrb3-hal
chown pi:pi /home/pi/.ssh/mrb3-hal
fi

pushd /home/pi
# Add .local/bin to PATH and add link to octoprint there
sudo -u pi mkdir -p .local/bin
sudo -u pi ln -s /home/pi/oprint/bin/octoprint .local/bin/
# Add symlink to preserve legacy compatibility for mrbtools
sudo -u pi ln -s oprint/lib/python2.7/site-packages
# sudo -u pi ln -s oprint/lib/python2.7/site-packages

if [ "$BEAMOS_INCLUDE_CHECK" = "yes" ]
then
Expand All @@ -253,6 +286,7 @@ pushd /home/pi
# picamera (OctoPrint-MrBeam dependency) needs to check /proc/cpuinfo at install time to figure out which model it's used with.
cp /filesystem/picamera/cpuinfo.pi3bp /proc/cpuinfo
gitclone BEAMOS_CAMERA_REPO OctoPrint-Camera
pip_install numpy==1.23.3
pip_install_dev_or_rm ./OctoPrint-Camera
set_plugin_update_conf_remote camera $BEAMOS_CAMERA_REPO_SHIP $BEAMOS_CAMERA_REPO_BRANCH
rm /proc/cpuinfo
Expand All @@ -279,8 +313,14 @@ pushd /home/pi
echo "Compiling OpenCV v.$BEAMOS_OPENCV_VERSION for python $PYTHON_VERSION -- This can take around an hour"
# Following the pyimagesearch tutorial
# https://www.pyimagesearch.com/2019/09/16/install-opencv-4-on-raspberry-pi-4-and-raspbian-buster/
DEV_LIBS_OPENCV="libjpeg-dev libtiff5-dev libjasper-dev libpng-dev libavcodec-dev libavformat-dev libswscale-dev libv4l-dev libxvidcore-dev libx264-dev libatlas-base-dev gfortran libhdf5-dev libhdf5-serial-dev"
# DEV_LIBS_OPENCV="libjpeg-dev libtiff5-dev libjasper-dev libpng-dev libavcodec-dev libavformat-dev libswscale-dev libv4l-dev libxvidcore-dev libx264-dev libatlas-base-dev gfortran libhdf5-dev libhdf5-serial-dev"
DEV_LIBS_OPENCV="cmake gcc g++ python3-dev python3-numpy libavcodec-dev libavformat-dev libswscale-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libgtk-3-dev"
apt-install $DEV_LIBS_OPENCV libhdf5-103

cp /filesystem/picamera/cpuinfo.pi3bp /proc/cpuinfo
pip_install opencv-python-headless
rm /proc/cpuinfo

# TODO finish up
sudo apt -y remove $DEV_LIBS_OPENCV # save space

Expand All @@ -290,13 +330,15 @@ pushd /home/pi
# as you don't have to configure the OpenCV build and link everything.
echo "--- Installing OpenCV from pip wheels ~ 10min because installs gtk"
# After this operation, 1085 MB of additional disk space will be used.
apt-install python-opencv
# apt-install python-opencv
sudo apt-get -y install python3-opencv
# link the global library to the oprint environment
ln -s /usr/lib/python2.7/dist-packages/cv2.arm-linux-gnueabihf.so /home/pi/oprint/lib/python2.7/cv2.so
ln -s /usr/lib/python3/dist-packages/cv2.cpython-37m-arm-linux-gnueabihf.so /home/pi/oprint/lib/python3.10/site-packages/cv2.so
# Headless install (which fails)
# PIP_DEFAULT_TIMEOUT=60 sudo -u pi $OPRINT/pip install opencv-python-headless
# Install the opencv wheel available for raspberry (also fails)
# PIP_DEFAULT_TIMEOUT=60 sudo -u pi /home/pi/oprint/bin/pip install opencv-python #opencv-contrib-python-nonfree-headless

fi
echo "--- Installing MrBeamPlugin"
# Library dependencies for lxml and PIL
Expand All @@ -308,7 +350,7 @@ pushd /home/pi

gitclone BEAMOS_MRBEAMPLUGIN_REPO OctoPrint-MrBeam
pip_install_dev_or_rm ./OctoPrint-MrBeam
set_plugin_update_conf_remote mrbeam $BEAMOS_MRBEAMPLUGIN_REPO_SHIP $BEAMOS_MRBEAMPLUGIN_REPO_BRANCH
# set_plugin_update_conf_remote mrbeam $BEAMOS_MRBEAMPLUGIN_REPO_SHIP $BEAMOS_MRBEAMPLUGIN_REPO_BRANCH
rm /proc/cpuinfo

# Install MrBeamDocs
Expand All @@ -329,7 +371,7 @@ pushd /home/pi
# Create a python2 venv because python2-pip might not be an available package
BEAMOS_IOBEAM_VENV=/usr/local/iobeam/venv
mkdir -p $(dirname $BEAMOS_IOBEAM_VENV)
python3 -m virtualenv -p python2 $BEAMOS_IOBEAM_VENV
python3.10 -m venv $BEAMOS_IOBEAM_VENV
# change pip commands to match the new virtualenv
# Do this BEFORE INSTALLING as - in the develop version,
# it will move the source folder, in which case we couldn't access it.
Expand All @@ -342,18 +384,13 @@ pushd /home/pi
# numpy and mrb_hw_info AND requests are not listed as a dependency in iobeam or mrb_hw_info, install them manually before iobeam
# They are installed on the root level because they use root files from time to time. See iobeam#69 (nice)
# iobeam is cloned as a submodule to /filesystem before running the script
if [ "$BEAMOS_DEV" = "yes" ]; then
PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install requests numpy
gitclone BEAMOS_IOBEAM_REPO iobeam
gitclone BEAMOS_MRBHWINFO_REPO mrb_hw_info
mv mrb_hw_info iobeam sources/
PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install -e sources/mrb_hw_info sources/iobeam
else
PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install requests numpy
sudo git clone -b $BEAMOS_IOBEAM_REPO_BRANCH $BEAMOS_IOBEAM_REPO_BUILD iobeam
PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install ./iobeam
sudo git clone -b $BEAMOS_MRBHWINFO_REPO_BRANCH $BEAMOS_MRBHWINFO_REPO_BUILD mrb_hw_info
PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install ./mrb_hw_info
PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install requests numpy
sudo git clone -b $BEAMOS_IOBEAM_REPO_BRANCH $BEAMOS_IOBEAM_REPO_BUILD iobeam
PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install ./iobeam
sudo git clone -b $BEAMOS_MRBHWINFO_REPO_BRANCH $BEAMOS_MRBHWINFO_REPO_BUILD mrb_hw_info
PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install ./mrb_hw_info

if [ "$BEAMOS_DEV" != "yes" ]; then
rm -rf mrb_hw_info
rm -rf iobeam
fi
Expand Down Expand Up @@ -388,7 +425,7 @@ pushd /home/pi
NETCONNECTD_PROJ=sources/netconnectd
gitclone BEAMOS_NETCONNECTD_REPO $NETCONNECTD_PROJ
# Create venv
python3 -m virtualenv -p python3 $BEAMOS_NETCONNECTD_VENV
python3.10 -m venv $BEAMOS_NETCONNECTD_VENV
$BEAMOS_NETCONNECTD_VENV/bin/python -m pip install $BEAMOS_NETCONNECTD_WIFI_ARCHIVE $NETCONNECTD_PROJ
pushd $NETCONNECTD_PROJ
mkdir -p /etc/netconnectd.conf.d/{hostapd,dnsmasq} /etc/network/interfaces.d/
Expand Down Expand Up @@ -458,7 +495,7 @@ pushd /home/pi
# apt-install python3-pip
# Install in a separate venv
LED_VENV=/usr/local/mrbeam_ledstrips/venv
python3 -m virtualenv -p python3 $LED_VENV
python3.10 -m venv $LED_VENV
$LED_VENV/bin/pip install $BEAMOS_RPI_WS281X_ARCHIVE $BEAMOS_MRBEAMLED_ARCHIVE
# Link the executables to have mrbeam_ledstrips(_cli) in the $PATH
ln -s $LED_VENV/bin/mrbeam_ledstrips /usr/bin/
Expand Down
4 changes: 3 additions & 1 deletion src/modules/dev-libs/start_chroot_script
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,7 @@ then
cp /etc/apt/sources.list /etc/apt/sources.list.backup
sed -i "s@http://raspbian.raspberrypi.org/raspbian/@$DEV_LIBS_APTMIRROR@g" /etc/apt/sources.list
fi

#apt-get -y install software-properties-common
#add-apt-repository ppa:deadsnakes/ppa
#apt-get update
apt-get install -y $(echo $DEV_LIBS_BASE $DEV_LIBS_EXTRA)
48 changes: 47 additions & 1 deletion src/modules/octopi/start_chroot_script
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,60 @@ else
fi
apt-get -y --force-yes install python3 python3-virtualenv git screen subversion cmake avahi-daemon libavahi-compat-libdnssd1 libatlas3-base

#apt-get -y install software-properties-common
#add-apt-repository ppa:deadsnakes/ppa
#apt-get update
#apt install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libreadline-dev libffi-dev wget
PYTHON3_VERSION=3.10.6
file="Python-${PYTHON3_VERSION}.tar.xz"
url="https://www.python.org/ftp/python/${PYTHON3_VERSION}/${file}"
apt-get -y install python3-virtualenv git screen subversion cmake avahi-daemon libavahi-compat-libdnssd1 libatlas3-base
#wget -qO - https://raw.githubusercontent.com/tvdsluijs/sh-python-installer/main/python.sh | sudo bash -s 3.10.0
echo "Updating & upgrading system"
apt -qq update && apt --yes --force-yes upgrade < /dev/null
echo "Installing Python essentials"
apt -qq install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libreadline-dev libffi-dev libsqlite3-dev wget libbz2-dev < /dev/null
echo "Downloading Python $PYTHON3_VERSION"
wget "${url}"
echo "Decompressing file"
tar -Jxf "${file}" < /dev/null
cd "Python-${PYTHON3_VERSION}"
echo "Prepare the source for the installation"
./configure --enable-optimizations
echo "(Install the new Python version $PYTHON3_VERSION)"
sudo make altinstall
#echo "Let's try to create package"
#sudo cpack
echo "Let's cleanup!"
cd ..
rm -rf "Python-${PYTHON3_VERSION}"
rm -r "${file}"

echo "Let's install PIP"
apt -qq install -y python3-pip < /dev/null

#echo "updating pip..."
#python"${py_main_version}" -m pip install --upgrade pip

new_python_version=$(python -c 'import platform; print(platform.python_version())')
echo "new python version $new_python_version"

new_python_version=$(python3 -c 'import platform; print(platform.python_version())')
echo "new python version3 $new_python_version"

new_python_version=$(python3.10 -c 'import platform; print(platform.python_version())')
echo "new python version3.10 $new_python_version"

echo " - Reinstall iputils-ping"
apt-get install --reinstall iputils-ping

pushd /home/"${BASE_USER}"

# build virtualenv
sudo -u "${BASE_USER}" python3 -m virtualenv --python=$PYTHON oprint
# sudo -u "${BASE_USER}" python3 -m virtualenv --python=$PYTHON oprint
sudo -u "${BASE_USER}" python3.10 -m venv oprint
sudo -u "${BASE_USER}" /home/"${BASE_USER}"/oprint/bin/pip install --upgrade pip
sudo -u "${BASE_USER}" /home/"${BASE_USER}"/oprint/bin/pip install wheel

# OctoPrint
if [ "$OCTOPI_INCLUDE_OCTOPRINT" == "yes" ]
Expand Down
8 changes: 3 additions & 5 deletions src/variants/beamos/config
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh
# variant mrbeam, flavor default: override hostname & custom config setting
export DIST_NAME=BeamOS
export DIST_VERSION=0.19.0
export DIST_VERSION=1.0.0dev0
export BASE_OVERRIDE_HOSTNAME=MrBeam-XXXX
export BASE_IMAGE_ENLARGEROOT=1700
export BASE_IMAGE_ENLARGEROOT=2000

export BEAMOS_DEV=no
export MODULES="base(raspicam, network, disable-services(dev-libs(octopi, beamos)))"
Expand All @@ -14,7 +14,7 @@ export BASE_PYPI_INDEX="http://datamania.atbo.studio:3141/root/dev/"

export OCTOPI_OCTOPRINT_REPO_BUILD=https://github.com/mrbeam/OctoPrint.git
export OCTOPI_OCTOPRINT_REPO_SHIP=https://github.com/mrbeam/OctoPrint.git
export OCTOPI_OCTOPRINT_REPO_BRANCH=v1.3.6.9
export OCTOPI_OCTOPRINT_REPO_BRANCH=feature/SW-1030-octoprint-upgrade-to-latest-v-1-x
# export OCTOPI_OCTOPRINT_ARCHIVE=/filesystem/OctoPrint
export OCTOPI_OCTOPRINT_ARCHIVE=https://github.com/mrbeam/OctoPrint/archive/$OCTOPI_OCTOPRINT_REPO_BRANCH.zip

Expand All @@ -25,8 +25,6 @@ export OCTOPI_INCLUDE_MJPGSTREAMER=no
export OCTOPI_INCLUDE_WIRINGPI=no
export OCTOPI_INCLUDE_FFMPEG_HLS=no

# Fix - only python2 compatible for now:
export OCTOPI_PYTHON_VERSION=python2
# Add dev repos to build up the MrBeam dependencies - Will not be kept in the image.
export DEV_LIBS_EXTRA="python2-dev libxml2-dev libxslt1-dev"

Expand Down
33 changes: 33 additions & 0 deletions src/variants/beamos/config.mrb3
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/bin/sh
export BEAMOS_DEV=yes
export BEAMOS_DEVICE_MODEL="mrb3"
export BEAMOS_MODEL="MRBEAM2_DC_S"

export BEAMOS_MRBEAMPLUGIN_ARCHIVE=https://github.com/mrbeam/mrb3-core-plugin/archive/$BEAMOS_MRBEAMPLUGIN_REPO_BRANCH.zip
export BEAMOS_MRBEAMPLUGIN_REPO_SHIP=https://github.com/mrbeam/mrb3-core-plugin.git
export [email protected]:mrbeam/mrb3-core-plugin.git
export BEAMOS_MRBEAMPLUGIN_REPO_BRANCH=alpha

export BEAMOS_CAMERA_REPO_BRANCH=mrbeam2-stable #TODO not python3 compatible version
export BEAMOS_FINDMYMRBEAM_REPO_BRANCH=alpha
export BEAMOS_FINDMYMRBEAM_REPO_BRANCH_BUILD=git@jackfan.us.kg-mrb3-findMe-plugin:mrbeam/mrb3-findMe-plugin.git
export BEAMOS_NETCONNECTD_PLUGIN_REPO_BRANCH=alpha
export BEAMOS_NETCONNECTD_PLUGIN_REPO_BUILD=git@jackfan.us.kg-mrb3-connect-plugin:mrbeam/mrb3-connect-plugin.git
## Dependencies
export BEAMOS_IOBEAM_REPO_BRANCH=feature/SW-1522-iobeam-to-python-3.10.x-in-githu #TODO will be HAL
export BEAMOS_IOBEAM_REPO_BUILD=git+ssh://[email protected]/mrbeam/iobeam.git
export BEAMOS_MRBHWINFO_REPO_BRANCH=SW-1677 #TODO will be HAL
export BEAMOS_MRBHWINFO_REPO_BUILD=git+ssh://[email protected]/mrbeam/mrb_hw_info.git
export BEAMOS_MRBEAMLED_REPO_BRANCH=SW-1677 #TODO will be HAL
export BEAMOS_MRBEAMLED_REPO_BUILD=https://github.com/mrbeam/MrBeamLedStrips.git
export BEAMOS_NETCONNECTD_REPO_BRANCH=alpha
export [email protected]:mrbeam/mrb3-connect-daemon.git
export BEAMOS_MRBEAMPLUGIN_DOCS_REPO_BRANCH=alpha
export [email protected]:mrbeam/mrb3-doc.git
## BeamOS-dependencies
export BEAMOS_MOUNTMANAGER_REPO_BRANCH=mrbeam2-stable
export BEAMOS_SHIELDFLASHER_REPO_BRANCH=master
export BEAMOS_RPI_WS281X_REPO_BRANCH=master
export BEAMOS_CHECK_REPO_BRANCH=beamos
export BEAMOS_NETCONNECTD_WIFI_REPO_BRANCH=master

8 changes: 8 additions & 0 deletions src/variants/beamos/config.oprint173
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/sh

export DIST_VERSION=0.19.0dev1

export BEAMOS_MRBEAMPLUGIN_ARCHIVE=https://github.com/mrbeam/mrb3-core-plugin/archive/$BEAMOS_MRBEAMPLUGIN_REPO_BRANCH.zip
export BEAMOS_MRBEAMPLUGIN_REPO_SHIP=https://github.com/mrbeam/mrb3-core-plugin.git
export [email protected]:mrbeam/mrb3-core-plugin.git
export BEAMOS_MRBEAMPLUGIN_REPO_BRANCH=epic/SW-1030-octoprint-upgrade-to-latest-v-1-x
Loading