From d17a4c07731ddd19c1835d512da4f5fd6a53de75 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Sun, 6 May 2018 15:19:04 +0200 Subject: [PATCH] Put git clone parts outside qemu in travis rpi cfg --- scripts/ci/rpi/mkimage.sh | 7 +++++++ scripts/ci/rpi/pisetup.sh | 10 ---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/scripts/ci/rpi/mkimage.sh b/scripts/ci/rpi/mkimage.sh index daf30d1..d1d84a0 100644 --- a/scripts/ci/rpi/mkimage.sh +++ b/scripts/ci/rpi/mkimage.sh @@ -75,6 +75,13 @@ cp /usr/bin/qemu-arm-static "${MOUNT}/usr/bin" cp "${MOUNT}/etc/ld.so.preload" "${MOUNT}/etc/_ld.so.preload" echo "" > "${MOUNT}/etc/ld.so.preload" +# git clone addons +git clone --depth=1 https://github.com/jeffcrouse/ofxJSON.git /home/pi/openFrameworks/addons/ofxJSON +git clone https://github.com/jvcleave/ofxOMXPlayer.git /home/pi/openFrameworks/addons/ofxOMXPlayer + +#git clone https://github.com/kr15h/ofxOMXPlayerLite.git +#mv ofxOMXPlayerLite ofxOMXPlayer + # copy ofxPiMapper to openFrameworks/addons mkdir "${MOUNT}/home/pi/openFrameworks/addons/ofxPiMapper" cp -r ./src "${MOUNT}/home/pi/openFrameworks/addons/ofxPiMapper/" diff --git a/scripts/ci/rpi/pisetup.sh b/scripts/ci/rpi/pisetup.sh index 12b9fcf..fdbc8cb 100644 --- a/scripts/ci/rpi/pisetup.sh +++ b/scripts/ci/rpi/pisetup.sh @@ -5,16 +5,6 @@ echo "Hello! Me is pisetup.sh script." pwd df -h -cd /home/pi/openFrameworks/addons -git clone --depth=1 https://github.com/jeffcrouse/ofxJSON.git - -if [ -e "ofxOMXPlayer" ]; then - rm -rf ofxOMXPlayer -fi - -git clone https://github.com/kr15h/ofxOMXPlayerLite.git -mv ofxOMXPlayerLite ofxOMXPlayer - cd ofxPiMapper/example_basic make -j$(nproc)