Merge branch 'stretch' of https://github.com/bashrc/freedombone

doc/EN/boards.org

@@ -20,6 +20,7 @@ The following ARM boards are supported by the build system. If your board isn't
  - a20-olinuxino-lime
  - a20-olinuxino-lime2
  - a20-olinuxino-micro
+ - [[http://www.lemaker.org/product-bananapro-index.html][Lemaker Banana Pro]]
 
 The latest image builds can be [[./downloads/current][found here]].
 

src/freedombone-image

@@ -697,7 +697,7 @@ Image was created.
 "
 fi
 
-ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.xz ${PROJECT_NAME}*.vdi ${PROJECT_NAME}*.qcow2
+#ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.xz ${PROJECT_NAME}*.vdi ${PROJECT_NAME}*.qcow2
 
 # Remove the mesh script after use
 if [[ $VARIANT == "mesh"* ]]; then
@@ -710,16 +710,17 @@ Password: $PASSWORD" > "${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt"
 chmod 600 "${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt"
 
 if [[ $IMAGE_TYPE != "qemu"* ]]; then
+    IMAGE_FILENAME=$(find "${CURR_DIR}" -name "*.img" | head -n 1 | awk -F '/' '{print $2}')
+
     echo ''
-    if [[ $VARIANT != 'meshclient' && $VARIANT != 'meshusb' ]]; then
+    echo $'To compress:'
-        echo $'You can copy the image to a microSD card with:'
+    echo ''
-    else
+    echo "  xz --no-warn --verbose --keep --threads=0 -3 ${IMAGE_FILENAME}"
-        echo $'You can copy the image to a USB drive with:'
+    echo ''
-    fi
+    echo 'To copy to microSD, USB drive or SSD'
     echo ''
-    echo "    unxz -k ${PROJECT_NAME}*.img.xz"
     echo '  sudo dd if=/dev/zero of=/dev/sdX bs=32M count=8'
-    echo "    sudo dd bs=32M if=${PROJECT_NAME}*.img of=/dev/sdX conv=fdatasync,sync,noerror"
+    echo "  sudo dd bs=32M if=${IMAGE_FILENAME} of=/dev/sdX conv=fdatasync,sync,noerror"
     echo ''
 fi
 

src/freedombone-image-customise

@@ -1049,11 +1049,13 @@ mesh_client_startup_applications() {
       echo 'dconf write /org/mate/power-manager/lock-hibernate false';
       echo 'dconf write /org/mate/power-manager/lock-keyring-hibernate false';
       echo 'dconf write /org/mate/desktop/peripherals/touchpad/scroll-method 2';
+      echo '#dconf write /org/mate/desktop.a11y.applications/screen-reader-enabled true';
+      echo '#dconf write /org/mate/interface/accessibility true';
+      echo '#dconf write /org/mate/applications-at-visual/startup true';
       echo "touch /home/$MY_USERNAME/.dbus/Xdbus";
       echo "chmod 600 /home/$MY_USERNAME/.dbus/Xdbus";
       echo "env | grep DBUS_SESSION_BUS_ADDRESS > /home/$MY_USERNAME/.dbus/Xdbus";
       echo "echo 'export DBUS_SESSION_BUS_ADDRESS' >> /home/$MY_USERNAME/.dbus/Xdbus";
-
       echo '';
       echo "amixer set 'Master' unmute";
       echo "amixer set 'Master' 50%";
@@ -1167,6 +1169,10 @@ configure_user_interface() {
     # for gtk dialog entry
     chroot "$rootdir" apt-get -yq install zenity
 
+    # accessibility
+    #chroot "$rootdir" apt-get -yq -t stretch-backports install gnome-orca
+    #chroot "$rootdir" apt-get -yq install festival
+
     # Produce a text file on the desktop listing users on the mesh
     cat <<EOF > "$rootdir/usr/bin/list-tox-users"
 #!/bin/bash

src/freedombone-image-hardware-setup

@@ -258,6 +258,10 @@ case "$MACHINE" in
         a20_setup_boot sun7i-a20-olinuxino-micro.dtb "$EXTERNAL_DRIVE"
         enable_serial_console ttyS0
         ;;
+    banana-pro)
+        a20_setup_boot sun7i-a20-bananapro.dtb "$EXTERNAL_DRIVE"
+        enable_serial_console ttyS0
+        ;;
     cubieboard2)
         a20_setup_boot sun7i-a20-cubieboard2.dtb "$EXTERNAL_DRIVE"
         enable_serial_console ttyS0

src/freedombone-image-make

@@ -119,7 +119,7 @@ case "$MACHINE" in
  --roottype btrfs \
 "
         ;;
-    cubietruck | a20-olinuxino-lime | a20-olinuxino-lime2 | a20-olinuxino-micro | cubieboard2 | pcduino3)
+    cubietruck | a20-olinuxino-lime | a20-olinuxino-lime2 | a20-olinuxino-micro | cubieboard2 | pcduino3 | banana-pro)
         extra_pkgs="$a20_pkgs"
         extra_opts="\
  --variant minbase \

src/freedombone-image-makefile

@@ -111,6 +111,17 @@ cubieboard2: prep
 	$(SIGN)
 	@echo "Build complete."
 
+# build Banana Pro SD card image
+banana-pro: prep
+	$(eval ARCHITECTURE = armhf)
+	$(eval MACHINE = banana-pro)
+	$(MAKE_IMAGE)
+	@rm -f $(ARCHIVE)
+	$(XZ)
+	@echo ""
+	$(SIGN)
+	@echo "Build complete."
+
 # build PCDuino3 SD card image
 pcduino3: prep
 	$(eval ARCHITECTURE = armhf)

src/freedombone-utils-nodejs

@@ -33,7 +33,7 @@ VARIANTS='mesh'
 
 # change these versions at your peril. Things will often crash if you don't
 # have specifically the correct versions
-NODEJS_VERSION='8.11.1'
+NODEJS_VERSION='8.11.2'
 NODEJS_N_VERSION='2.1.7'
 NPM_VERSION='5.8.0'
 

website/EN/boards.html

@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2018-04-15 Sun 18:22 -->
+<!-- 2018-05-17 Thu 18:48 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -242,9 +242,9 @@ for the JavaScript code in this tag.
 </p>
 </div>
 
-<div id="outline-container-org8a04b66" class="outline-2">
+<div id="outline-container-org4cb621d" class="outline-2">
-<h2 id="org8a04b66">Supported ARM boards</h2>
+<h2 id="org4cb621d">Supported ARM boards</h2>
-<div class="outline-text-2" id="text-org8a04b66">
+<div class="outline-text-2" id="text-org4cb621d">
 <p>
 The following ARM boards are supported by the build system. If your board isn't listed here then you may still be able to install Freedombone using <a href="./armbian.html">Armbian</a>.
 </p>
@@ -257,6 +257,7 @@ The following ARM boards are supported by the build system. If your board isn't
 <li>a20-olinuxino-lime</li>
 <li>a20-olinuxino-lime2</li>
 <li>a20-olinuxino-micro</li>
+<li><a href="http://www.lemaker.org/product-bananapro-index.html">Lemaker Banana Pro</a></li>
 </ul>
 
 <p>