Explorar el Código

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

Bob Mottram hace 6 años
padre
commit
80a98b7cd5

+ 1
- 0
doc/EN/boards.org Ver fichero

20
  - a20-olinuxino-lime
20
  - a20-olinuxino-lime
21
  - a20-olinuxino-lime2
21
  - a20-olinuxino-lime2
22
  - a20-olinuxino-micro
22
  - a20-olinuxino-micro
23
+ - [[http://www.lemaker.org/product-bananapro-index.html][Lemaker Banana Pro]]
23
 
24
 
24
 The latest image builds can be [[./downloads/current][found here]].
25
 The latest image builds can be [[./downloads/current][found here]].
25
 
26
 

BIN
man/freedombone-image.1.gz Ver fichero


+ 10
- 9
src/freedombone-image Ver fichero

697
 "
697
 "
698
 fi
698
 fi
699
 
699
 
700
-ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.xz ${PROJECT_NAME}*.vdi ${PROJECT_NAME}*.qcow2
700
+#ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.xz ${PROJECT_NAME}*.vdi ${PROJECT_NAME}*.qcow2
701
 
701
 
702
 # Remove the mesh script after use
702
 # Remove the mesh script after use
703
 if [[ $VARIANT == "mesh"* ]]; then
703
 if [[ $VARIANT == "mesh"* ]]; then
710
 chmod 600 "${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt"
710
 chmod 600 "${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt"
711
 
711
 
712
 if [[ $IMAGE_TYPE != "qemu"* ]]; then
712
 if [[ $IMAGE_TYPE != "qemu"* ]]; then
713
+    IMAGE_FILENAME=$(find "${CURR_DIR}" -name "*.img" | head -n 1 | awk -F '/' '{print $2}')
714
+
713
     echo ''
715
     echo ''
714
-    if [[ $VARIANT != 'meshclient' && $VARIANT != 'meshusb' ]]; then
715
-        echo $'You can copy the image to a microSD card with:'
716
-    else
717
-        echo $'You can copy the image to a USB drive with:'
718
-    fi
716
+    echo $'To compress:'
717
+    echo ''
718
+    echo "  xz --no-warn --verbose --keep --threads=0 -3 ${IMAGE_FILENAME}"
719
+    echo ''
720
+    echo 'To copy to microSD, USB drive or SSD'
719
     echo ''
721
     echo ''
720
-    echo "    unxz -k ${PROJECT_NAME}*.img.xz"
721
-    echo '    sudo dd if=/dev/zero of=/dev/sdX bs=32M count=8'
722
-    echo "    sudo dd bs=32M if=${PROJECT_NAME}*.img of=/dev/sdX conv=fdatasync,sync,noerror"
722
+    echo '  sudo dd if=/dev/zero of=/dev/sdX bs=32M count=8'
723
+    echo "  sudo dd bs=32M if=${IMAGE_FILENAME} of=/dev/sdX conv=fdatasync,sync,noerror"
723
     echo ''
724
     echo ''
724
 fi
725
 fi
725
 
726
 

+ 7
- 1
src/freedombone-image-customise Ver fichero

1049
       echo 'dconf write /org/mate/power-manager/lock-hibernate false';
1049
       echo 'dconf write /org/mate/power-manager/lock-hibernate false';
1050
       echo 'dconf write /org/mate/power-manager/lock-keyring-hibernate false';
1050
       echo 'dconf write /org/mate/power-manager/lock-keyring-hibernate false';
1051
       echo 'dconf write /org/mate/desktop/peripherals/touchpad/scroll-method 2';
1051
       echo 'dconf write /org/mate/desktop/peripherals/touchpad/scroll-method 2';
1052
+      echo '#dconf write /org/mate/desktop.a11y.applications/screen-reader-enabled true';
1053
+      echo '#dconf write /org/mate/interface/accessibility true';
1054
+      echo '#dconf write /org/mate/applications-at-visual/startup true';
1052
       echo "touch /home/$MY_USERNAME/.dbus/Xdbus";
1055
       echo "touch /home/$MY_USERNAME/.dbus/Xdbus";
1053
       echo "chmod 600 /home/$MY_USERNAME/.dbus/Xdbus";
1056
       echo "chmod 600 /home/$MY_USERNAME/.dbus/Xdbus";
1054
       echo "env | grep DBUS_SESSION_BUS_ADDRESS > /home/$MY_USERNAME/.dbus/Xdbus";
1057
       echo "env | grep DBUS_SESSION_BUS_ADDRESS > /home/$MY_USERNAME/.dbus/Xdbus";
1055
       echo "echo 'export DBUS_SESSION_BUS_ADDRESS' >> /home/$MY_USERNAME/.dbus/Xdbus";
1058
       echo "echo 'export DBUS_SESSION_BUS_ADDRESS' >> /home/$MY_USERNAME/.dbus/Xdbus";
1056
-
1057
       echo '';
1059
       echo '';
1058
       echo "amixer set 'Master' unmute";
1060
       echo "amixer set 'Master' unmute";
1059
       echo "amixer set 'Master' 50%";
1061
       echo "amixer set 'Master' 50%";
1167
     # for gtk dialog entry
1169
     # for gtk dialog entry
1168
     chroot "$rootdir" apt-get -yq install zenity
1170
     chroot "$rootdir" apt-get -yq install zenity
1169
 
1171
 
1172
+    # accessibility
1173
+    #chroot "$rootdir" apt-get -yq -t stretch-backports install gnome-orca
1174
+    #chroot "$rootdir" apt-get -yq install festival
1175
+
1170
     # Produce a text file on the desktop listing users on the mesh
1176
     # Produce a text file on the desktop listing users on the mesh
1171
     cat <<EOF > "$rootdir/usr/bin/list-tox-users"
1177
     cat <<EOF > "$rootdir/usr/bin/list-tox-users"
1172
 #!/bin/bash
1178
 #!/bin/bash

+ 4
- 0
src/freedombone-image-hardware-setup Ver fichero

258
         a20_setup_boot sun7i-a20-olinuxino-micro.dtb "$EXTERNAL_DRIVE"
258
         a20_setup_boot sun7i-a20-olinuxino-micro.dtb "$EXTERNAL_DRIVE"
259
         enable_serial_console ttyS0
259
         enable_serial_console ttyS0
260
         ;;
260
         ;;
261
+    banana-pro)
262
+        a20_setup_boot sun7i-a20-bananapro.dtb "$EXTERNAL_DRIVE"
263
+        enable_serial_console ttyS0
264
+        ;;
261
     cubieboard2)
265
     cubieboard2)
262
         a20_setup_boot sun7i-a20-cubieboard2.dtb "$EXTERNAL_DRIVE"
266
         a20_setup_boot sun7i-a20-cubieboard2.dtb "$EXTERNAL_DRIVE"
263
         enable_serial_console ttyS0
267
         enable_serial_console ttyS0

+ 1
- 1
src/freedombone-image-make Ver fichero

119
  --roottype btrfs \
119
  --roottype btrfs \
120
 "
120
 "
121
         ;;
121
         ;;
122
-    cubietruck | a20-olinuxino-lime | a20-olinuxino-lime2 | a20-olinuxino-micro | cubieboard2 | pcduino3)
122
+    cubietruck | a20-olinuxino-lime | a20-olinuxino-lime2 | a20-olinuxino-micro | cubieboard2 | pcduino3 | banana-pro)
123
         extra_pkgs="$a20_pkgs"
123
         extra_pkgs="$a20_pkgs"
124
         extra_opts="\
124
         extra_opts="\
125
  --variant minbase \
125
  --variant minbase \

+ 11
- 0
src/freedombone-image-makefile Ver fichero

111
 	$(SIGN)
111
 	$(SIGN)
112
 	@echo "Build complete."
112
 	@echo "Build complete."
113
 
113
 
114
+# build Banana Pro SD card image
115
+banana-pro: prep
116
+	$(eval ARCHITECTURE = armhf)
117
+	$(eval MACHINE = banana-pro)
118
+	$(MAKE_IMAGE)
119
+	@rm -f $(ARCHIVE)
120
+	$(XZ)
121
+	@echo ""
122
+	$(SIGN)
123
+	@echo "Build complete."
124
+
114
 # build PCDuino3 SD card image
125
 # build PCDuino3 SD card image
115
 pcduino3: prep
126
 pcduino3: prep
116
 	$(eval ARCHITECTURE = armhf)
127
 	$(eval ARCHITECTURE = armhf)

+ 1
- 1
src/freedombone-utils-nodejs Ver fichero

33
 
33
 
34
 # change these versions at your peril. Things will often crash if you don't
34
 # change these versions at your peril. Things will often crash if you don't
35
 # have specifically the correct versions
35
 # have specifically the correct versions
36
-NODEJS_VERSION='8.11.1'
36
+NODEJS_VERSION='8.11.2'
37
 NODEJS_N_VERSION='2.1.7'
37
 NODEJS_N_VERSION='2.1.7'
38
 NPM_VERSION='5.8.0'
38
 NPM_VERSION='5.8.0'
39
 
39
 

+ 5
- 4
website/EN/boards.html Ver fichero

3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
-<!-- 2018-04-15 Sun 18:22 -->
6
+<!-- 2018-05-17 Thu 18:48 -->
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9
 <title>&lrm;</title>
9
 <title>&lrm;</title>
242
 </p>
242
 </p>
243
 </div>
243
 </div>
244
 
244
 
245
-<div id="outline-container-org8a04b66" class="outline-2">
246
-<h2 id="org8a04b66">Supported ARM boards</h2>
247
-<div class="outline-text-2" id="text-org8a04b66">
245
+<div id="outline-container-org4cb621d" class="outline-2">
246
+<h2 id="org4cb621d">Supported ARM boards</h2>
247
+<div class="outline-text-2" id="text-org4cb621d">
248
 <p>
248
 <p>
249
 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>.
249
 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>.
250
 </p>
250
 </p>
257
 <li>a20-olinuxino-lime</li>
257
 <li>a20-olinuxino-lime</li>
258
 <li>a20-olinuxino-lime2</li>
258
 <li>a20-olinuxino-lime2</li>
259
 <li>a20-olinuxino-micro</li>
259
 <li>a20-olinuxino-micro</li>
260
+<li><a href="http://www.lemaker.org/product-bananapro-index.html">Lemaker Banana Pro</a></li>
260
 </ul>
261
 </ul>
261
 
262
 
262
 <p>
263
 <p>