diff options
-rwxr-xr-x | 40-build-vivid.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/40-build-vivid.sh b/40-build-vivid.sh index a7ada73..d123adf 100755 --- a/40-build-vivid.sh +++ b/40-build-vivid.sh @@ -10,20 +10,23 @@ BUILDDIR="$(builddir $ID)" VIVID_SOURCES=$(srcdir vivid) +LIBCAMERA_SOURCES="$(srcdir libcamera)" +LIBCAMERA_BRANCH=integration_tests + #### Building and compiling if [ ! -d $VIVID_SOURCES ]; then echo "Cloning Vivid tree" git clone git-libcamera-org@ci.git.libcamera.org:libcamera/vivid.git $VIVID_SOURCES - git -C $VIVID_SOURCES remote add linuxtv.org git://linuxtv.org/libcamera.git + git -C $VIVID_SOURCES remote add testing $LIBCAMERA_SOURCES fi function update() { git -C $VIVID_SOURCES checkout vivid || return $? git -C $VIVID_SOURCES reset --hard origin/vivid || return $? - git -C $VIVID_SOURCES fetch linuxtv.org - git -C $VIVID_SOURCES rebase linuxtv.org/master || return $? + git -C $VIVID_SOURCES fetch testing + git -C $VIVID_SOURCES rebase testing/$LIBCAMERA_BRANCH || return $? } function build() { |