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

Rename branch

This commit is contained in:
Bob Mottram 2017-06-08 11:12:05 +01:00
parent 16350b4c36
commit 6bb05c99c7
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/freedombone-image-customise
View File

@ -389,7 +389,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 " git checkout 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
@ -1342,11 +1342,10 @@ echo "# End of avahi-daemon" >> $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
chmod +x $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME chmod +x $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
echo "*/1 * * * * root /usr/bin/$WATCHDOG_SCRIPT_NAME" >> $rootdir/etc/crontab echo "*/1 * * * * root /usr/bin/$WATCHDOG_SCRIPT_NAME" >> $rootdir/etc/crontab
# 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 git checkout stretch
make install make install
cp image_build/bbb-4.9.0.tar.gz /boot/bbb.tar.gz cp image_build/bbb-4.9.0.tar.gz /boot/bbb.tar.gz
EOF EOF

3
src/freedombone-upgrade
View File

@ -87,8 +87,7 @@ 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 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}