Explorar el Código

Set local repo clone to stretch

This should be removed after the upgrade
Bob Mottram hace 7 años
padre
commit
4c220de1fe
Se han modificado 2 ficheros con 5 adiciones y 0 borrados
  1. 3
    0
      src/freedombone-image-customise
  2. 2
    0
      src/freedombone-upgrade

+ 3
- 0
src/freedombone-image-customise Ver fichero

@@ -387,6 +387,7 @@ EOF
387 387
     echo "    cd /root/${PROJECT_NAME}" >> $rootdir/root/.bashrc
388 388
     echo "    git stash" >> $rootdir/root/.bashrc
389 389
     echo "    git pull" >> $rootdir/root/.bashrc
390
+    echo "    git checkout bashrc/stretch" >> $rootdir/root/.bashrc
390 391
     echo "    make install" >> $rootdir/root/.bashrc
391 392
 
392 393
     if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
@@ -1292,9 +1293,11 @@ fi
1292 1293
 sed -i "s|#host-name=.*|host-name=${PROJECT_NAME}|g" $rootdir/etc/avahi/avahi-daemon.conf
1293 1294
 sed -i "s|host-name=.*|host-name=${PROJECT_NAME}|g" $rootdir/etc/avahi/avahi-daemon.conf
1294 1295
 
1296
+# TODO temporary for stretch
1295 1297
 chroot "$rootdir" /bin/bash -x <<EOF
1296 1298
 git clone $PROJECT_REPO /root/$PROJECT_NAME
1297 1299
 cd /root/$PROJECT_NAME
1300
+git checkout bashrc/stretch
1298 1301
 make install
1299 1302
 EOF
1300 1303
 

+ 2
- 0
src/freedombone-upgrade Ver fichero

@@ -87,6 +87,8 @@ 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 92
         make install
91 93
         if [ -d /usr/share/${PROJECT_NAME} ]; then
92 94
             chown -R root:root /usr/share/${PROJECT_NAME}