ソースを参照

Don't install scuttlebot on arm

Bob Mottram 7 年 前
コミット
0f405c932f
共有3 個のファイルを変更した16 個の追加9 個の削除を含む
  1. 9
    9
      doc/EN/mesh.org
  2. 4
    0
      src/freedombone-app-scuttlebot
  3. 3
    0
      src/freedombone-utils-nodejs

+ 9
- 9
doc/EN/mesh.org ファイルの表示

@@ -97,7 +97,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.x
97 97
 wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig
98 98
 gpg --verify freedombone-meshclient-i386.img.xz.sig
99 99
 sha256sum freedombone-meshclient-i386.img.xz
100
-f7e261d369d6f0ccf650dbbed18227bfe5ec427ae0b97f56e1f1e202afc6d0b3
100
+995dd64538f46f6abf83ba258cca6cb82a72399cb9a099caeafc1de947ef795c
101 101
 unxz freedombone-meshclient-i386.img.xz
102 102
 sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
103 103
 sudo dd bs=1M if=freedombone-meshclient-i386.img of=/dev/sdX conv=fdatasync
@@ -113,7 +113,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i
113 113
 wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig
114 114
 gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig
115 115
 sha256sum freedombone-meshclient-insecure-i386.img.xz
116
-3bfbcaedb587c5cbddec8b9fffcd48398d9e3b97486ef49aa645357f61a0f11f
116
+b06e6ff5e56577025e6b994fe0bb28f02da7d2905ac32a2f38d7d074ffe801fc
117 117
 unxz freedombone-meshclient-insecure-i386.img.xz
118 118
 sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
119 119
 sudo dd bs=1M if=freedombone-meshclient-insecure-i386.img of=/dev/sdX conv=fdatasync
@@ -130,13 +130,13 @@ The above picture shows a Beaglebone Black with the image copied onto a microSD
130 130
 
131 131
 #+begin_src bash
132 132
 sudo apt-get install xz-utils wget
133
-wget https://freedombone.net/downloads/v3/freedombone-mesh-3_beaglebone-armhf.img.xz
134
-wget https://freedombone.net/downloads/v3/freedombone-mesh-3_beaglebone-armhf.img.xz.sig
135
-gpg --verify freedombone-mesh-3_beaglebone-armhf.img.xz.sig
136
-sha256sum freedombone-mesh-3_beaglebone-armhf.img.xz
137
-ab783ea807da1144bd076f7b43e54b5f4376ecf1ea1f86f56ac76c3469325802
138
-unxz freedombone-mesh-3_beaglebone-armhf.img.xz
139
-sudo dd bs=1M if=freedombone-mesh-3_beaglebone-armhf.img of=/dev/sdX conv=fdatasync
133
+wget https://freedombone.net/downloads/current/freedombone-mesh_beaglebone-armhf.img.xz
134
+wget https://freedombone.net/downloads/current/freedombone-mesh_beaglebone-armhf.img.xz.sig
135
+gpg --verify freedombone-mesh_beaglebone-armhf.img.xz.sig
136
+sha256sum freedombone-mesh_beaglebone-armhf.img.xz
137
+
138
+unxz freedombone-mesh_beaglebone-armhf.img.xz
139
+sudo dd bs=1M if=freedombone-mesh_beaglebone-armhf.img of=/dev/sdX conv=fdatasync
140 140
 #+end_src
141 141
 
142 142
 If you have a few Beaglebone Blacks to use as routers then repeat the /dd/ command to create however many microSD cards you need.

+ 4
- 0
src/freedombone-app-scuttlebot ファイルの表示

@@ -197,6 +197,10 @@ function remove_scuttlebot {
197 197
 }
198 198
 
199 199
 function mesh_install_scuttlebot {
200
+    if [[ $VARIANT == "mesh" ]]; then
201
+        return
202
+    fi
203
+
200 204
     cat <<EOF > $rootdir/usr/bin/install_scuttlebot
201 205
 #!/bin/bash
202 206
 npm install -g scuttlebot@${SCUTTLEBOT_VERSION}

+ 3
- 0
src/freedombone-utils-nodejs ファイルの表示

@@ -63,6 +63,9 @@ function get_npm_arch {
63 63
 function mesh_install_nodejs {
64 64
     mesh_install_nodejs_prefix=
65 65
     if [ $rootdir ]; then
66
+        if [[ $VARIANT == "mesh" ]]; then
67
+            return
68
+        fi
66 69
         mesh_install_nodejs_prefix="chroot $rootdir"
67 70
     fi
68 71
     $mesh_install_nodejs_prefix apt-get -yq install g++ m4 libtool automake nodejs curl