Browse Source

Rename branch

Bob Mottram 7 years ago
parent
commit
6bb05c99c7
2 changed files with 3 additions and 5 deletions
  1. 2
    3
      src/freedombone-image-customise
  2. 1
    2
      src/freedombone-upgrade

+ 2
- 3
src/freedombone-image-customise View File

@@ -389,7 +389,7 @@ EOF
389 389
     echo "    cd /root/${PROJECT_NAME}" >> $rootdir/root/.bashrc
390 390
     echo "    git stash" >> $rootdir/root/.bashrc
391 391
     echo "    git pull" >> $rootdir/root/.bashrc
392
-    echo "    git checkout bashrc/stretch" >> $rootdir/root/.bashrc
392
+    echo "    git checkout stretch" >> $rootdir/root/.bashrc
393 393
     echo "    make install" >> $rootdir/root/.bashrc
394 394
 
395 395
     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
1342 1342
 chmod +x $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
1343 1343
 echo "*/1            * *   *   *   root /usr/bin/$WATCHDOG_SCRIPT_NAME" >> $rootdir/etc/crontab
1344 1344
 
1345
-# TODO temporary for stretch
1346 1345
 chroot "$rootdir" /bin/bash -x <<EOF
1347 1346
 git clone $PROJECT_REPO /root/$PROJECT_NAME
1348 1347
 cd /root/$PROJECT_NAME
1349
-git checkout bashrc/stretch
1348
+git checkout stretch
1350 1349
 make install
1351 1350
 cp image_build/bbb-4.9.0.tar.gz /boot/bbb.tar.gz
1352 1351
 EOF

+ 1
- 2
src/freedombone-upgrade View File

@@ -87,8 +87,7 @@ if [ -d $PROJECT_DIR ]; then
87 87
         else
88 88
             git_pull $PROJECT_REPO origin/$DEVELOPMENT_BRANCH
89 89
         fi
90
-        # TODO temporary for stretch
91
-        git checkout bashrc/stretch
90
+        git checkout stretch
92 91
         make install
93 92
         if [ -d /usr/share/${PROJECT_NAME} ]; then
94 93
             chown -R root:root /usr/share/${PROJECT_NAME}