CreatBot/CreatBotCrowsnest
CreatBot/CreatBotCrowsnest
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fixed custompios module

Browse Source 
Module now uses "make install"

Added new Option in config:
CROWSNEST_FORCE_RASPICAMFIX="[y|n]"

The Installer ignores to implement Raspicamfix due qemu environment.
Choose "y" to force install of fix.
Works only with Raspberry SBC's!

Signed-off-by: Stephan Wendel <me@stephanwe.de>
This commit is contained in:
Stephan Wendel 2022-03-07 18:22:22 +01:00
parent 0176ce769c
commit afcb651abd
No known key found for this signature in database
GPG Key ID: F465B83ACBA45639
3 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
custompios/crowsnest/config
View File

@ -16,6 +16,7 @@
[ -n "$CROWSNEST_DEFAULT_CONF" ] || CROWSNEST_DEFAULT_CONF="mainsail_default.conf" [ -n "$CROWSNEST_DEFAULT_CONF" ] || CROWSNEST_DEFAULT_CONF="mainsail_default.conf"
[ -n "$CROWSNEST_DEFAULT_CONF_DIR" ] || CROWSNEST_DEFAULT_CONF_DIR="/home/${BASE_USER}/klipper_config" [ -n "$CROWSNEST_DEFAULT_CONF_DIR" ] || CROWSNEST_DEFAULT_CONF_DIR="/home/${BASE_USER}/klipper_config"
[ -n "$CROWSNEST_MOONRAKER_SUPPORT" ] || CROWSNEST_MOONRAKER_SUPPORT="y" [ -n "$CROWSNEST_MOONRAKER_SUPPORT" ] || CROWSNEST_MOONRAKER_SUPPORT="y"
[ -n "$CROWSNEST_FORCE_RASPICAMFIX" ] || CROWSNEST_FORCE_RASPICAMFIX="y"
# ustreamer # ustreamer
[ -n "$CROWSNEST_USTREAMER_DEPS" ] || CROWSNEST_USTREAMER_DEPS="git build-essential libevent-dev libjpeg62-turbo-dev \ [ -n "$CROWSNEST_USTREAMER_DEPS" ] || CROWSNEST_USTREAMER_DEPS="git build-essential libevent-dev libjpeg62-turbo-dev \

52
custompios/crowsnest/start_chroot_script
View File

@ -20,26 +20,36 @@ install_cleanup_trap
echo_green "Installing crowsnest and enable webcam Service ..." echo_green "Installing crowsnest and enable webcam Service ..."
# install dependencies # install dependencies
apt_update_skip # force apt update
apt update
check_install_pkgs ${CROWSNEST_CROWSNEST_DEPS} check_install_pkgs ${CROWSNEST_CROWSNEST_DEPS}
# Move to $HOME dir # Move to $HOME dir
pushd /home/${BASE_USER} pushd /home/${BASE_USER} &> /dev/null || exit 1
# make sure config folder exist # make sure config folder exist
if [ ! -d "${CROWSNEST_DEFAULT_CONF_DIR}" ]; then if [ ! -d "${CROWSNEST_DEFAULT_CONF_DIR}" ]; then
mkdir -p "${CROWSNEST_DEFAULT_CONF_DIR}" sudo -u "${BASE_USER}" mkdir -p "${CROWSNEST_DEFAULT_CONF_DIR}"
fi fi
# clone Repo # clone Repo
echo_green "Clone crowsnest repository ..." echo_green "Clone crowsnest repository ..."
gitclone CROWSNEST_CROWSNEST_REPO crowsnest gitclone CROWSNEST_CROWSNEST_REPO crowsnest
# install crowsnest # install crowsnest
pushd /home/${BASE_USER}/crowsnest pushd /home/${BASE_USER}/crowsnest &> /dev/null || exit 1
echo_green "Running crowsnest installer ..." echo_green "Running crowsnest installer ..."
sudo -u ${BASE_USER} make install sudo -u "${BASE_USER}" make install
# add update manager section to moonraker.conf # add update manager section to moonraker.conf
if [ -f "/home/${BASE_USER}/klipper_config/moonraker.conf" ] && if [ -f "/home/${BASE_USER}/klipper_config/moonraker.conf" ] &&
[ "${CROWSNEST_MOONRAKER_SUPPORT}" == "y" ]; then [ "${CROWSNEST_MOONRAKER_SUPPORT}" == "y" ]; then
cat file_templates/moonraker_update.txt | \ sudo -u ${BASE_USER} \
sudo -u ${BASE_USER} tee -a /home/${BASE_USER}/klipper_config/moonraker.conf sh -c 'echo -e "\n" >> /home/$(whoami)/klipper_config/moonraker.conf'
fi sudo -u ${BASE_USER} \
popd sh -c 'cat file_templates/moonraker_update.txt \
popd >> /home/$(whoami)/klipper_config/moonraker.conf'
fi
if [ "${CROWSNEST_FORCE_RASPICAMFIX}" == "y" ]; then
echo -en "Applying Raspicam Fix ... \r"
sudo sh -c 'echo "bcm2835-v4l2" >> /etc/modules'
sudo cp file_templates/bcm2835-v4l2.conf /etc/modprobe.d/
echo -e "Applying Raspicam Fix ... [OK]"
fi
popd &> /dev/null || exit 1
popd &> /dev/null || exit 1

1
file_templates/moonraker_update.txt
View File

@ -1,4 +1,3 @@
[update_manager webcamd] [update_manager webcamd]
type: git_repo type: git_repo
path: ~/crowsnest path: ~/crowsnest