From 45582d046f369e3041ed1817f36bb15bcbbe4302 Mon Sep 17 00:00:00 2001 From: Oskar Weigl Date: Tue, 29 Jan 2019 19:37:56 -0800 Subject: [PATCH 1/2] Update tup PPA url in travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 99852c97..0337261e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ install: - export TUP_DIR=$HOME/dl/tup_0.7.5-0~16.04.york0_amd64 - export TUP_ARCHIVE=$HOME/dl/tup_0.7.5-0~16.04.york0_amd64.deb -- export TUP_URL=http://ppa.launchpad.net/jonathonf/tup/ubuntu/pool/main/t/tup/tup_0.7.5-0~16.04.york0_amd64.deb +- export TUP_URL=http://ppa.launchpad.net/jonathonf/tup/ubuntu/pool/main/t/tup/tup_0.7.8-2~16.04.york0_amd64.deb - if [ ! -e $TUP_DIR/bin/tup ]; then wget $TUP_URL -O $TUP_ARCHIVE; dpkg-deb -R $TUP_ARCHIVE $TUP_DIR; fi - export PATH=$PATH:$TUP_DIR/usr/bin From 5392cb7ab3aea5d9501948e6d0a4fe98c84652d6 Mon Sep 17 00:00:00 2001 From: samuelsadok Date: Thu, 31 Jan 2019 01:12:02 +0100 Subject: [PATCH 2/2] fix tup build error --- Firmware/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/build.sh b/Firmware/build.sh index 1622fa69..8f3a0730 100755 --- a/Firmware/build.sh +++ b/Firmware/build.sh @@ -15,6 +15,7 @@ export CONFIG_STRICT=true rm -rdf build mkdir -p build env | grep ^CONFIG > tup.config +tup init tup generate ./tup_build.sh bash -xe ./tup_build.sh