From c92dbb73a0b01012cfd90a1c654179d0466cf485 Mon Sep 17 00:00:00 2001 From: Patrick Gehrsitz Date: Sat, 7 Dec 2024 22:24:46 +0100 Subject: [PATCH] fix: change cs branch temporarily to fix compiling error (#280) Signed-off-by: Patrick Gehrsitz --- bin/build.sh | 2 +- custompios/crowsnest/config | 2 +- tools/configure.sh | 2 +- tools/libs/config.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 992d2f21..18227501 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -41,7 +41,7 @@ fi # Camera-streamer repo CSTREAMER_PATH="camera-streamer" if [[ -z "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" ]]; then - CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/ayufan/camera-streamer.git" + CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/mryel00/camera-streamer.git" fi if [[ -z "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" ]]; then CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="master" diff --git a/custompios/crowsnest/config b/custompios/crowsnest/config index 85b096a1..8c263cbc 100644 --- a/custompios/crowsnest/config +++ b/custompios/crowsnest/config @@ -27,7 +27,7 @@ [[ -n "$CROWSNEST_USTREAMER_REPO_BRANCH" ]] || CROWSNEST_USTREAMER_REPO_BRANCH="master" # camera-streamer -[[ -n "$CROWSNEST_CAMERA_STREAMER_REPO_SHIP" ]] || CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/ayufan/camera-streamer.git" +[[ -n "$CROWSNEST_CAMERA_STREAMER_REPO_SHIP" ]] || CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/mryel00/camera-streamer.git" [[ -n "$CROWSNEST_CAMERA_STREAMER_REPO_BRANCH" ]] || CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="master" ########################################################################### diff --git a/tools/configure.sh b/tools/configure.sh index 11c82467..5669b125 100755 --- a/tools/configure.sh +++ b/tools/configure.sh @@ -28,7 +28,7 @@ CN_CONFIG_ENVPATH="${CN_CONFIG_ROOTPATH}/systemd" CN_MOONRAKER_CONFIG_PATH="${CN_CONFIG_CONFIGPATH}/moonraker.conf" CN_USTREAMER_REPO="https://github.com/pikvm/ustreamer.git" CN_USTREAMER_BRANCH="v6.10" -CN_CAMERA_STREAMER_REPO="https://github.com/ayufan/camera-streamer.git" +CN_CAMERA_STREAMER_REPO="https://github.com/mryel00/camera-streamer.git" CN_CAMERA_STREAMER_BRANCH="master" ### Messages diff --git a/tools/libs/config.sh b/tools/libs/config.sh index 6f9419bc..45d9607a 100755 --- a/tools/libs/config.sh +++ b/tools/libs/config.sh @@ -37,7 +37,7 @@ import_config() { [[ -n "${CROWSNEST_ENV_PATH}" ]] || CROWSNEST_ENV_PATH="/home/${BASE_USER}/printer_data/systemd" [[ -n "${CROWSNEST_USTREAMER_REPO_SHIP}" ]] || CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/pikvm/ustreamer.git" [[ -n "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]] || CROWSNEST_USTREAMER_REPO_BRANCH="v6.10" - [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/ayufan/camera-streamer.git" + [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/mryel00/camera-streamer.git" [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="master" status_msg "Using default configuration ..." "0" fi