Pārlūkot izejas kodu

Set local repo clone to stretch

This should be removed after the upgrade
Bob Mottram 8 gadus atpakaļ
vecāks
revīzija
4c220de1fe
2 mainītis faili ar 5 papildinājumiem un 0 dzēšanām
  1. 3
    0
      src/freedombone-image-customise
  2. 2
    0
      src/freedombone-upgrade

+ 3
- 0
src/freedombone-image-customise Parādīt failu

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 bashrc/stretch" >> $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
1292
 sed -i "s|#host-name=.*|host-name=${PROJECT_NAME}|g" $rootdir/etc/avahi/avahi-daemon.conf
1293
 sed -i "s|#host-name=.*|host-name=${PROJECT_NAME}|g" $rootdir/etc/avahi/avahi-daemon.conf
1293
 sed -i "s|host-name=.*|host-name=${PROJECT_NAME}|g" $rootdir/etc/avahi/avahi-daemon.conf
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
 chroot "$rootdir" /bin/bash -x <<EOF
1297
 chroot "$rootdir" /bin/bash -x <<EOF
1296
 git clone $PROJECT_REPO /root/$PROJECT_NAME
1298
 git clone $PROJECT_REPO /root/$PROJECT_NAME
1297
 cd /root/$PROJECT_NAME
1299
 cd /root/$PROJECT_NAME
1300
+git checkout bashrc/stretch
1298
 make install
1301
 make install
1299
 EOF
1302
 EOF
1300
 
1303
 

+ 2
- 0
src/freedombone-upgrade Parādīt failu

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