merged with master-initial

setup.sh

@@ -270,21 +270,37 @@ echo "    core-image-elphel393" >> $CONF_NOTES
 echo "" >> $CONF_NOTES
 
 CURRENT_PATH2=$(dirname $(readlink -f "$0"))
-echo "CHECKPOINT "$CURRENT_PATH2
+echo ""
+
 BBLAYERS_CONF="conf/bblayers.conf"
 LOCAL_CONF="conf/local.conf"
-if [ -f build/$BBLAYERS_CONF ]; then
-    echo "removing build/$BBLAYERS_CONF, a new file will be regenerated"
-    rm build/$BBLAYERS_CONF
-fi 
-if [ -f build/$LOCAL_CONF ]; then
-    echo "removing build/$LOCAL_CONF, a new file will be regenerated"
+
+MISSING_LOCAL_CONF=0
+MISSING_BBLAYERS_CONF=0
+
+if [ ! -f build/$LOCAL_CONF ]; then
+    MISSING_LOCAL_CONF=1
+else
+    echo "build/$LOCAL_CONF exists, updating default version: build/${LOCAL_CONF}_default"
+    cp build/$LOCAL_CONF build/$LOCAL_CONF"_bkp"
     rm build/$LOCAL_CONF
 fi
+
+if [ ! -f build/$BBLAYERS_CONF ]; then
+    MISSING_BBLAYERS_CONF=1
+else
+    echo "build/$BBLAYERS_CONF exists, updating default version: build/${BBLAYERS_CONF}_default"
+    cp build/$BBLAYERS_CONF build/$BBLAYERS_CONF"_bkp"
+    rm build/$BBLAYERS_CONF
+fi
+
 echo ""
 
+echo "Running: . ./oe-init-build-env build. If config files existed they will be backed up and restored"
 . ./oe-init-build-env build
 
+echo ""
+
 echo "BBLAYERS = \" \\" >> $BBLAYERS_CONF
 echo "  $CURRENT_PATH2/meta \\" >> $BBLAYERS_CONF
 echo "  $CURRENT_PATH2/meta-yocto \\" >> $BBLAYERS_CONF
@@ -308,6 +324,20 @@ echo "MACHINE ?= \"elphel393\"" >> $LOCAL_CONF
 # Elphel's MIRROR website, \n is important
 echo "MIRRORS =+ \"http://.*/.*     http://mirror.elphel.com/elphel393_mirror/ \\n \"" >> $LOCAL_CONF
 
-
 echo "REMOTE_USER ?= \"root\""  >> $LOCAL_CONF
-echo "REMOTE_IP ?= \"192.168.0.7\""  >> $LOCAL_CONF
+echo "REMOTE_IP ?= \"192.168.0.9\""  >> $LOCAL_CONF
+
+if [ $MISSING_BBLAYERS_CONF -eq 0 ]; then
+    echo "restoring $BBLAYERS_CONF"
+    cp $BBLAYERS_CONF $BBLAYERS_CONF"_default"
+    cp $BBLAYERS_CONF"_bkp" $BBLAYERS_CONF
+    echo "NOTE: If anything breaks after running setup.sh, compare your bblayers.conf and bblayers.conf_default"
+fi
+
+if [ $MISSING_LOCAL_CONF -eq 0 ]; then
+    echo "restoring $LOCAL_CONF"
+    cp $LOCAL_CONF $LOCAL_CONF"_default"
+    cp $LOCAL_CONF"_bkp" $LOCAL_CONF
+    echo "NOTE: If anything breaks after running setup.sh, compare your local.conf and local.conf_default"
+fi
+