Skip to content

Commit b7f7c74

Browse files
committed
Add support for Raspberry Pi 1 (B+).
This makes it possible to run the ChirpStack Gateway OS on the IMST Lite Gateway. The change to meta-rust-bin is needed as meta-rust generates NEON instructions that can't be executed on the Pi 1 B+ (it fails with Illegal instruction). See meta-rust/meta-rust#262 for more information.
1 parent acdc181 commit b7f7c74

File tree

20 files changed

+262
-144
lines changed

20 files changed

+262
-144
lines changed

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
path = layers/meta-swupdate
2222
url = https://github.com/sbabic/meta-swupdate
2323
branch = zeus
24-
[submodule "layers/meta-rust"]
25-
path = layers/meta-rust
26-
url = https://github.com/meta-rust/meta-rust
2724
[submodule "layers/meta-clang"]
2825
path = layers/meta-clang
2926
url = https://github.com/kraj/meta-clang.git
3027
branch = zeus
28+
[submodule "layers/meta-rust-bin"]
29+
path = layers/meta-rust-bin
30+
url = https://github.com/rust-embedded/meta-rust-bin.git

layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-concentratord/chirpstack-concentratord-sx1301_3.0.0-test.1.bb

Lines changed: 0 additions & 11 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
require chirpstack-concentratord.inc
2+
3+
SUMMARY = "ChirpStack Concentratord for SX1301"
4+
PR = "r1"
5+
6+
do_install() {
7+
install -d ${D}${bindir}
8+
if [ "${CARGO_BUILD_TYPE}" = "--release" ]; then
9+
local cargo_bindir="${CARGO_RELEASE_DIR}"
10+
else
11+
local cargo_bindir="${CARGO_DEBUG_DIR}"
12+
fi
13+
14+
install -m 0755 ${cargo_bindir}/chirpstack-concentratord-sx1301 ${D}${bindir}
15+
}

layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-concentratord/chirpstack-concentratord-sx1302_3.0.0-test.1.bb

Lines changed: 0 additions & 11 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
require chirpstack-concentratord.inc
2+
3+
SUMMARY = "ChirpStack Concentratord for SX1302"
4+
PR = "r1"
5+
6+
do_install() {
7+
install -d ${D}${bindir}
8+
if [ "${CARGO_BUILD_TYPE}" = "--release" ]; then
9+
local cargo_bindir="${CARGO_RELEASE_DIR}"
10+
else
11+
local cargo_bindir="${CARGO_DEBUG_DIR}"
12+
fi
13+
14+
install -m 0755 ${cargo_bindir}/chirpstack-concentratord-sx1302 ${D}${bindir}
15+
}

layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-concentratord/chirpstack-concentratord.inc

Lines changed: 2 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PRIORITY = "optional"
55
LICENSE = "MIT"
66
LIC_FILES_CHKSUM = "file://LICENSE;md5=99e425257f8a67b7efd81dc0009ed8ff"
77

8-
SRC_URI += "git://github.com/brocaar/chirpstack-concentratord.git;protocol=git;tag=v${PV}"
8+
SRC_URI = "git://github.com/brocaar/chirpstack-concentratord.git;protocol=git;tag=v${PV}"
99
S = "${WORKDIR}/git"
1010

1111
DEPENDS = "\
@@ -18,89 +18,4 @@ RDEPENDS_${PN} = "\
1818
chirpstack-concentratord-base \
1919
"
2020

21-
export LIBCLANG_PATH="${STAGING_LIBDIR_NATIVE}"
22-
export BINDGEN_EXTRA_CLANG_ARGS="-I${STAGING_INCDIR} -mfloat-abi=hard"
23-
24-
SRC_URI += " \
25-
crate://crates.io/aho-corasick/0.7.6 \
26-
crate://crates.io/ansi_term/0.11.0 \
27-
crate://crates.io/atty/0.2.13 \
28-
crate://crates.io/autocfg/0.1.7 \
29-
crate://crates.io/bindgen/0.52.0 \
30-
crate://crates.io/bitflags/1.2.1 \
31-
crate://crates.io/byteorder/1.3.2 \
32-
crate://crates.io/c2-chacha/0.2.3 \
33-
crate://crates.io/cc/1.0.48 \
34-
crate://crates.io/cexpr/0.3.6 \
35-
crate://crates.io/cfg-if/0.1.10 \
36-
crate://crates.io/chirpstack_api/3.0.5 \
37-
crate://crates.io/chrono/0.4.10 \
38-
crate://crates.io/clang-sys/0.28.1 \
39-
crate://crates.io/clap/2.33.0 \
40-
crate://crates.io/cmake/0.1.42 \
41-
crate://crates.io/colored/1.9.0 \
42-
crate://crates.io/env_logger/0.7.1 \
43-
crate://crates.io/error-chain/0.10.0 \
44-
crate://crates.io/getrandom/0.1.13 \
45-
crate://crates.io/glob/0.3.0 \
46-
crate://crates.io/hex/0.3.2 \
47-
crate://crates.io/hex/0.4.0 \
48-
crate://crates.io/humantime-serde/0.1.1 \
49-
crate://crates.io/humantime/1.3.0 \
50-
crate://crates.io/lazy_static/1.4.0 \
51-
crate://crates.io/lazycell/1.2.1 \
52-
crate://crates.io/libc/0.2.66 \
53-
crate://crates.io/libloading/0.5.2 \
54-
crate://crates.io/log/0.4.8 \
55-
crate://crates.io/memchr/2.2.1 \
56-
crate://crates.io/metadeps/1.1.2 \
57-
crate://crates.io/nom/4.2.3 \
58-
crate://crates.io/num-integer/0.1.41 \
59-
crate://crates.io/num-traits/0.2.10 \
60-
crate://crates.io/peeking_take_while/0.1.2 \
61-
crate://crates.io/pkg-config/0.3.17 \
62-
crate://crates.io/ppv-lite86/0.2.6 \
63-
crate://crates.io/proc-macro2/1.0.6 \
64-
crate://crates.io/protobuf/2.8.1 \
65-
crate://crates.io/quick-error/1.2.2 \
66-
crate://crates.io/quote/1.0.2 \
67-
crate://crates.io/rand/0.7.2 \
68-
crate://crates.io/rand_chacha/0.2.1 \
69-
crate://crates.io/rand_core/0.5.1 \
70-
crate://crates.io/rand_hc/0.2.0 \
71-
crate://crates.io/redox_syscall/0.1.56 \
72-
crate://crates.io/regex-syntax/0.6.12 \
73-
crate://crates.io/regex/1.3.1 \
74-
crate://crates.io/rustc-hash/1.0.1 \
75-
crate://crates.io/serde/1.0.104 \
76-
crate://crates.io/serde_derive/1.0.104 \
77-
crate://crates.io/shlex/0.1.1 \
78-
crate://crates.io/simple_logger/1.3.0 \
79-
crate://crates.io/strsim/0.8.0 \
80-
crate://crates.io/syn/1.0.11 \
81-
crate://crates.io/termcolor/1.0.5 \
82-
crate://crates.io/textwrap/0.11.0 \
83-
crate://crates.io/thread_local/0.3.6 \
84-
crate://crates.io/time/0.1.42 \
85-
crate://crates.io/toml/0.2.1 \
86-
crate://crates.io/toml/0.5.5 \
87-
crate://crates.io/unicode-width/0.1.7 \
88-
crate://crates.io/unicode-xid/0.2.0 \
89-
crate://crates.io/uuid/0.8.1 \
90-
crate://crates.io/vec_map/0.8.1 \
91-
crate://crates.io/version_check/0.1.5 \
92-
crate://crates.io/wasi/0.7.0 \
93-
crate://crates.io/which/3.1.0 \
94-
crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
95-
crate://crates.io/winapi-util/0.1.2 \
96-
crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
97-
crate://crates.io/winapi/0.3.8 \
98-
crate://crates.io/wincolor/1.0.2 \
99-
crate://crates.io/zeromq-src/0.1.8+4.3.2 \
100-
crate://crates.io/zmq-sys/0.11.0 \
101-
crate://crates.io/zmq/0.9.2 \
102-
crate://crates.io/syslog/5.0.0 \
103-
crate://crates.io/error-chain/0.12.1 \
104-
"
105-
106-
BBCLASSEXTEND = "native"
21+
export BINDGEN_EXTRA_CLANG_ARGS="-I${STAGING_INCDIR}"

layers/chirpstack/meta-semtech/recipes-lora/libloragw-sx1301/libloragw-sx1301_5.0.1.bb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ HOMEPAGE = "https://github.com/Lora-net/lora_gateway"
33
PRIORITY = "optional"
44
LICENSE = "BSD"
55
LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb"
6-
PR = "r7"
6+
PR = "r8"
7+
PRR = "r2"
78

89
SRC_URI = "\
9-
git://github.com/Lora-net/lora_gateway.git;protocol=git;tag=v${PV} \
10+
git://github.com/brocaar/lora_gateway.git;protocol=git;tag=v${PV}${PRR} \
1011
file://library.cfg \
1112
"
1213

layers/meta-rust

Lines changed: 0 additions & 1 deletion
This file was deleted.

layers/meta-rust-bin

Submodule meta-rust-bin added at 1f331ea
Submodule openembedded-core updated from 2bba005 to af41a22

0 commit comments

Comments
 (0)