diff --git a/doc/EN/boards.org b/doc/EN/boards.org index 3d57109e..bd0ad696 100644 --- a/doc/EN/boards.org +++ b/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]]. diff --git a/man/freedombone-image.1.gz b/man/freedombone-image.1.gz index c70a24e3..261975ab 100644 Binary files a/man/freedombone-image.1.gz and b/man/freedombone-image.1.gz differ diff --git a/src/freedombone-image b/src/freedombone-image index fb202a3e..968501d6 100755 --- a/src/freedombone-image +++ b/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 $'You can copy the image to a microSD card with:' - else - echo $'You can copy the image to a USB drive with:' - fi + echo $'To compress:' 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 " xz --no-warn --verbose --keep --threads=0 -3 ${IMAGE_FILENAME}" + echo '' + echo 'To copy to microSD, USB drive or SSD' + echo '' + echo ' sudo dd if=/dev/zero of=/dev/sdX bs=32M count=8' + echo " sudo dd bs=32M if=${IMAGE_FILENAME} of=/dev/sdX conv=fdatasync,sync,noerror" echo '' fi diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index c212ae4c..7d547276 100755 --- a/src/freedombone-image-customise +++ b/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 < "$rootdir/usr/bin/list-tox-users" #!/bin/bash diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup index ea297faa..7c109122 100755 --- a/src/freedombone-image-hardware-setup +++ b/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 diff --git a/src/freedombone-image-make b/src/freedombone-image-make index e5b2d416..a78ffc90 100755 --- a/src/freedombone-image-make +++ b/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 \ diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile index 24e34405..1d764a95 100755 --- a/src/freedombone-image-makefile +++ b/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) diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs index 09a63261..c4910bba 100755 --- a/src/freedombone-utils-nodejs +++ b/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' diff --git a/website/EN/boards.html b/website/EN/boards.html index efa4c7b3..5a634614 100644 --- a/website/EN/boards.html +++ b/website/EN/boards.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ‎ @@ -242,9 +242,9 @@ for the JavaScript code in this tag.

-
-

Supported ARM boards

-
+
+

Supported ARM boards

+

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 Armbian.

@@ -257,6 +257,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
    • +
  • Lemaker Banana Pro