Browse Source

Stick with jessie

Bob Mottram 8 years ago
parent
commit
0ee038545f
2 changed files with 3 additions and 0 deletions
  1. 2
    0
      src/freedombone-image-customise
  2. 1
    0
      src/freedombone-upgrade

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

387
     echo "    cd /root/${PROJECT_NAME}" >> $rootdir/root/.bashrc
387
     echo "    cd /root/${PROJECT_NAME}" >> $rootdir/root/.bashrc
388
     echo "    git stash" >> $rootdir/root/.bashrc
388
     echo "    git stash" >> $rootdir/root/.bashrc
389
     echo "    git pull" >> $rootdir/root/.bashrc
389
     echo "    git pull" >> $rootdir/root/.bashrc
390
+    echo "    git checkout jessie" >> $rootdir/root/.bashrc
390
     echo "    make install" >> $rootdir/root/.bashrc
391
     echo "    make install" >> $rootdir/root/.bashrc
391
 
392
 
392
     if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
393
     if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
1295
 chroot "$rootdir" /bin/bash -x <<EOF
1296
 chroot "$rootdir" /bin/bash -x <<EOF
1296
 git clone $PROJECT_REPO /root/$PROJECT_NAME
1297
 git clone $PROJECT_REPO /root/$PROJECT_NAME
1297
 cd /root/$PROJECT_NAME
1298
 cd /root/$PROJECT_NAME
1299
+git checkout jessie
1298
 make install
1300
 make install
1299
 EOF
1301
 EOF
1300
 
1302
 

+ 1
- 0
src/freedombone-upgrade View File

87
         else
87
         else
88
             git_pull $PROJECT_REPO origin/$DEVELOPMENT_BRANCH
88
             git_pull $PROJECT_REPO origin/$DEVELOPMENT_BRANCH
89
         fi
89
         fi
90
+        git checkout jessie
90
         make install
91
         make install
91
         if [ -d /usr/share/${PROJECT_NAME} ]; then
92
         if [ -d /usr/share/${PROJECT_NAME} ]; then
92
             chown -R root:root /usr/share/${PROJECT_NAME}
93
             chown -R root:root /usr/share/${PROJECT_NAME}