Bob Mottram 8 anni fa
parent
commit
6bb05c99c7
2 ha cambiato i file con 3 aggiunte e 5 eliminazioni
  1. 2
    3
      src/freedombone-image-customise
  2. 1
    2
      src/freedombone-upgrade

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

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

+ 1
- 2
src/freedombone-upgrade Vedi 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
-        # TODO temporary for stretch
91
-        git checkout bashrc/stretch
90
+        git checkout stretch
92
         make install
91
         make install
93
         if [ -d /usr/share/${PROJECT_NAME} ]; then
92
         if [ -d /usr/share/${PROJECT_NAME} ]; then
94
             chown -R root:root /usr/share/${PROJECT_NAME}
93
             chown -R root:root /usr/share/${PROJECT_NAME}