free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set local repo clone to stretch 

This should be removed after the upgrade
This commit is contained in:
Bob Mottram 2017-05-29 15:27:21 +01:00
parent c961fb02f2
commit 4c220de1fe
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/freedombone-image-customise
View File

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

2
src/freedombone-upgrade
View File

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