From 6bb05c99c7f022b87cf81f37ab73c6bc20ce59bb Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 8 Jun 2017 11:12:05 +0100
Subject: [PATCH] Rename branch

---
 src/freedombone-image-customise | 5 ++---
 src/freedombone-upgrade         | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index ded80543..8a3e801f 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -389,7 +389,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 "    git checkout stretch" >> $rootdir/root/.bashrc
     echo "    make install" >> $rootdir/root/.bashrc
 
     if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
@@ -1342,11 +1342,10 @@ echo "# End of avahi-daemon" >> $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
 chmod +x $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
 echo "*/1            * *   *   *   root /usr/bin/$WATCHDOG_SCRIPT_NAME" >> $rootdir/etc/crontab
 
-# 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
+git checkout stretch
 make install
 cp image_build/bbb-4.9.0.tar.gz /boot/bbb.tar.gz
 EOF
diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade
index ec534349..b179100c 100755
--- a/src/freedombone-upgrade
+++ b/src/freedombone-upgrade
@@ -87,8 +87,7 @@ if [ -d $PROJECT_DIR ]; then
         else
             git_pull $PROJECT_REPO origin/$DEVELOPMENT_BRANCH
         fi
-        # TODO temporary for stretch
-        git checkout bashrc/stretch
+        git checkout stretch
         make install
         if [ -d /usr/share/${PROJECT_NAME} ]; then
             chown -R root:root /usr/share/${PROJECT_NAME}