From 4c220de1fe3aee494ac631d68579205f9bff374d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 29 May 2017 15:27:21 +0100
Subject: [PATCH] Set local repo clone to stretch

This should be removed after the upgrade
---
 src/freedombone-image-customise | 3 +++
 src/freedombone-upgrade         | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index b5a3f259..20df2981 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -387,6 +387,7 @@ EOF
     echo "    cd /root/${PROJECT_NAME}" >> $rootdir/root/.bashrc
     echo "    git stash" >> $rootdir/root/.bashrc
     echo "    git pull" >> $rootdir/root/.bashrc
+    echo "    git checkout bashrc/stretch" >> $rootdir/root/.bashrc
     echo "    make install" >> $rootdir/root/.bashrc
 
     if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
@@ -1292,9 +1293,11 @@ fi
 sed -i "s|#host-name=.*|host-name=${PROJECT_NAME}|g" $rootdir/etc/avahi/avahi-daemon.conf
 sed -i "s|host-name=.*|host-name=${PROJECT_NAME}|g" $rootdir/etc/avahi/avahi-daemon.conf
 
+# TODO temporary for stretch
 chroot "$rootdir" /bin/bash -x <<EOF
 git clone $PROJECT_REPO /root/$PROJECT_NAME
 cd /root/$PROJECT_NAME
+git checkout bashrc/stretch
 make install
 EOF
 
diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade
index 1d1f963c..ec534349 100755
--- a/src/freedombone-upgrade
+++ b/src/freedombone-upgrade
@@ -87,6 +87,8 @@ if [ -d $PROJECT_DIR ]; then
         else
             git_pull $PROJECT_REPO origin/$DEVELOPMENT_BRANCH
         fi
+        # TODO temporary for stretch
+        git checkout bashrc/stretch
         make install
         if [ -d /usr/share/${PROJECT_NAME} ]; then
             chown -R root:root /usr/share/${PROJECT_NAME}