Skip to content

Commit

Permalink
Hotfix for mraa (#504)
Browse files Browse the repository at this point in the history
* fix for #500 . Use mraa v1.7.0 release instead of mraa master branch

For release 0.4.2 a github checkout of the master branch was used. There
for a change in mraa could break openaps. For the master branch we
should always use a mraa release instead of a master branch checkout.

* upgrade to 0.4.3

* fix output if MRAA release can't be cloned

copy/paste error
  • Loading branch information
PieterGit authored and scottleibrand committed Jun 24, 2017
1 parent 5e55ece commit 5dfd444
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
11 changes: 7 additions & 4 deletions bin/oref0-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -500,13 +500,16 @@ if [[ "$ttyport" =~ "spi" ]]; then
if ! ldconfig -p | grep -q mraa; then
echo Installing swig etc.
sudo apt-get install -y libpcre3-dev git cmake python-dev swig || die "Could not install swig etc."
MRAA_RELEASE="v1.7.0" # GitHub hash 8ddbcde84e2d146bc0f9e38504d6c89c14291480

if [ -d "$HOME/src/mraa/" ]; then
echo "$HOME/src/mraa/ already exists; pulling latest master branch"
(cd ~/src/mraa && git fetch && git checkout master && git pull) || die "Couldn't pull latest mraa master"
echo -n "$HOME/src/mraa/ already exists; "
#(echo "Pulling latest master branch" && cd ~/src/mraa && git fetch && git checkout master && git pull) || die "Couldn't pull latest mraa master" # used for oref0 dev
(echo "Updating mraa source to stable release ${MRAA_RELEASE}" && cd $HOME/src/mraa && git fetch && git checkout ${MRAA_RELEASE} && git pull) || die "Couldn't pull latest mraa ${MRAA_RELEASE} release" # used for oref0 master
else
echo -n "Cloning mraa master: "
(cd ~/src && git clone -b master https://github.com/intel-iot-devkit/mraa.git) || die "Couldn't clone mraa master"
echo -n "Cloning mraa "
#(echo -n "master branch. " && cd ~/src && git clone -b master https://github.com/intel-iot-devkit/mraa.git) || die "Couldn't clone mraa master" # used for oref0 dev
(echo -n "stable release ${MRAA_RELEASE}. " && cd $HOME/src && git clone -b ${MRAA_RELEASE} https://github.com/intel-iot-devkit/mraa.git) || die "Couldn't clone mraa release ${MRAA_RELEASE}" # used for oref0 master
fi
( cd $HOME/src/ && mkdir -p mraa/build && cd $_ && cmake .. -DBUILDSWIGNODE=OFF && \
make && sudo make install && echo && touch /tmp/reboot-required && echo mraa installed. Please reboot before using. && echo ) || die "Could not compile mraa"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oref0",
"version": "0.4.2",
"version": "0.4.3",
"description": "openaps oref0 reference implementation of the reference design",
"scripts": {
"test": "make test",
Expand Down

0 comments on commit 5dfd444

Please sign in to comment.