Skip to content

Commit a817077

Browse files
brocaarbrocaar
committed
Update to Yocto Dunfell + build Go apps from source.
This merges #55 by @macpijan with some minor modifications: * Updated all meta-layers to their latest (dunfell) version * Add fix for compiling Wireguard Closes #55.
1 parent b05836f commit a817077

File tree

19 files changed

+102
-54
lines changed

19 files changed

+102
-54
lines changed

‎.gitmodules‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
[submodule "bitbake"]
22
path = bitbake
33
url = git://git.openembedded.org/bitbake
4-
branch = 1.44
4+
branch = 1.46
55
[submodule "layers/openembedded/meta-openembedded"]
66
path = layers/openembedded/meta-openembedded
77
url = git://git.openembedded.org/meta-openembedded
8-
branch = zeus
8+
branch = dunfell
99
[submodule "layers/openembedded/openembedded-core"]
1010
path = layers/openembedded/openembedded-core
1111
url = git://git.openembedded.org/openembedded-core
12-
branch = zeus
12+
branch = dunfell
1313
[submodule "layers/bsp/meta-raspberrypi"]
1414
path = layers/bsp/meta-raspberrypi
1515
url = git://git.yoctoproject.org/meta-raspberrypi
16-
branch = zeus
16+
branch = dunfell
1717
[submodule "docs/themes/chirpstack-hugo-theme"]
1818
path = docs/themes/chirpstack-hugo-theme
1919
url = https://github.com/brocaar/chirpstack-hugo-theme.git
2020
[submodule "layers/meta-swupdate"]
2121
path = layers/meta-swupdate
2222
url = https://github.com/sbabic/meta-swupdate
23-
branch = zeus
23+
branch = dunfell
2424
[submodule "layers/meta-clang"]
2525
path = layers/meta-clang
2626
url = https://github.com/kraj/meta-clang.git
27-
branch = zeus
27+
branch = master
2828
[submodule "layers/meta-rust-bin"]
2929
path = layers/meta-rust-bin
3030
url = https://github.com/rust-embedded/meta-rust-bin.git

‎bitbake‎

Submodule bitbake updated from 6836184 to 6cc09fa

‎layers/bsp/meta-raspberrypi‎

Submodule meta-raspberrypi updated from 0e05098 to ac71747

‎layers/chirpstack/meta-chirpstack/conf/layer.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
77

88
BBFILE_COLLECTIONS += "chirpstack"
99
BBFILE_PATTERN_chirpstack = "^${LAYERDIR}/"
10-
LAYERSERIES_COMPAT_chirpstack = "zeus"
10+
LAYERSERIES_COMPAT_chirpstack = "dunfell"

‎layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-application-server/chirpstack-application-server_3.10.0.bb‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,40 @@ PRIORITY = "optional"
44
LICENSE = "MIT"
55
LIC_FILES_CHKSUM = "file://LICENSE;md5=5301050fd7cd58850085239d559297be"
66
SRC_URI = " \
7-
https://artifacts.chirpstack.io/downloads/chirpstack-application-server/chirpstack-application-server_${PV}_linux_armv5.tar.gz \
7+
git://git@github.com/brocaar/chirpstack-application-server.git;protocol=https;tag=v${PV}; \
88
file://chirpstack-application-server.init \
99
file://chirpstack-application-server.monit \
1010
file://chirpstack-application-server.toml \
1111
"
12-
SRC_URI[md5sum] = "0a538fbd6d6f2a78eb25735281879ed7"
13-
SRC_URI[sha256sum] = "d81b98c0cdcaf9d71b2022c962308be283c91dd3c9fdb43089c83c718b38e68c"
1412
PR = "r1"
1513

16-
inherit update-rc.d
14+
inherit update-rc.d goarch
1715

1816
INITSCRIPT_NAME = "chirpstack-application-server"
1917
INITSCRIPT_PARAMS = "defaults"
2018

21-
S = "${WORKDIR}"
19+
S = "${WORKDIR}/git"
20+
21+
DEPENDS = "go-native go-bindata-native nodejs-native"
22+
23+
export GOOS = "${TARGET_GOOS}"
24+
export GOARCH = "${TARGET_GOARCH}"
25+
export GOARM = "${TARGET_GOARM}"
26+
export GOCACHE = "${S}/build/.cache"
27+
export GOPATH = "${S}/build"
28+
29+
export HOME = "${WORKDIR}"
30+
31+
do_configure[noexec] = "1"
32+
33+
do_compile() {
34+
oe_runmake ui-requirements
35+
oe_runmake
36+
}
2237

2338
do_install() {
2439
install -d ${D}${bindir}
25-
install -m 0755 chirpstack-application-server ${D}${bindir}
40+
install -m 0755 ${S}/build/chirpstack-application-server ${D}${bindir}
2641

2742
install -d ${D}${sysconfdir}/chirpstack-application-server
2843
install -m 0640 ${WORKDIR}/chirpstack-application-server.toml ${D}${sysconfdir}/chirpstack-application-server/chirpstack-application-server.toml

‎layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-gateway-bridge/chirpstack-gateway-bridge_3.7.1.bb‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,38 @@ HOMEPAGE = "https://www.chirpstack.io/"
33
PRIORITY = "optional"
44
LICENSE = "MIT"
55
LIC_FILES_CHKSUM = "file://LICENSE;md5=99e425257f8a67b7efd81dc0009ed8ff"
6-
SRC_URI = "https://artifacts.chirpstack.io/downloads/chirpstack-gateway-bridge/chirpstack-gateway-bridge_${PV}_linux_armv5.tar.gz \
7-
file://chirpstack-gateway-bridge.toml \
8-
file://chirpstack-gateway-bridge.init \
9-
file://chirpstack-gateway-bridge.monit \
6+
SRC_URI = " \
7+
git://git@github.com/brocaar/chirpstack-gateway-bridge.git;protocol=https;tag=v${PV}; \
8+
file://chirpstack-gateway-bridge.toml \
9+
file://chirpstack-gateway-bridge.init \
10+
file://chirpstack-gateway-bridge.monit \
1011
"
11-
SRC_URI[md5sum] = "542e4640ea110b808737f33ca3f81e22"
12-
SRC_URI[sha256sum] = "233ac8baa13477e5a67d95e132abbe279c23c06e6d3dc27a6b37206eb77772dd"
1312
PR = "r1"
1413

15-
inherit update-rc.d
14+
inherit update-rc.d goarch
1615

1716
INITSCRIPT_NAME = "chirpstack-gateway-bridge"
1817
INITSCRIPT_PARAMS = "defaults"
1918

20-
S = "${WORKDIR}"
19+
S = "${WORKDIR}/git"
20+
21+
DEPENDS = "go-native"
22+
23+
export GOOS = "${TARGET_GOOS}"
24+
export GOARCH = "${TARGET_GOARCH}"
25+
export GOARM = "${TARGET_GOARM}"
26+
export GOCACHE = "${S}/build/.cache"
27+
export GOPATH = "${S}/build"
28+
29+
do_configure[noexec] = "1"
30+
31+
do_compile() {
32+
oe_runmake
33+
}
2134

2235
do_install() {
2336
install -d ${D}${bindir}
24-
install -m 0755 chirpstack-gateway-bridge ${D}${bindir}
37+
install -m 0755 ${S}/build/chirpstack-gateway-bridge ${D}${bindir}
2538

2639
install -d ${D}${sysconfdir}/chirpstack-gateway-bridge
2740
install -m 0640 ${WORKDIR}/chirpstack-gateway-bridge.toml ${D}${sysconfdir}/chirpstack-gateway-bridge/chirpstack-gateway-bridge.toml

‎layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-network-server/chirpstack-network-server_3.9.0.bb‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PRIORITY = "optional"
44
LICENSE = "MIT"
55
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3a340e43ab9867d3e5d0ea79a54b0e1"
66
SRC_URI = " \
7-
https://artifacts.chirpstack.io/downloads/chirpstack-network-server/chirpstack-network-server_${PV}_linux_armv5.tar.gz \
7+
git://git@github.com/brocaar/chirpstack-network-server.git;protocol=https;tag=v${PV}; \
88
file://chirpstack-network-server.init \
99
file://chirpstack-network-server.monit \
1010
file://config/au915_0.toml \
@@ -25,20 +25,32 @@ SRC_URI = " \
2525
file://config/us915_6.toml \
2626
file://config/us915_7.toml \
2727
"
28-
SRC_URI[md5sum] = "6c9058916dd578c1f7b76240f5356631"
29-
SRC_URI[sha256sum] = "0347c1d69a1afc9c2a13788979120aa5f8711bf7c23020a389e03adb3adb8f4f"
3028
PR = "r1"
3129

32-
inherit update-rc.d
30+
inherit update-rc.d goarch
3331

3432
INITSCRIPT_NAME = "chirpstack-network-server"
3533
INITSCRIPT_PARAMS = "defaults"
3634

37-
S = "${WORKDIR}"
35+
S = "${WORKDIR}/git"
36+
37+
DEPENDS = "go-native go-bindata-native"
38+
39+
export GOOS = "${TARGET_GOOS}"
40+
export GOARCH = "${TARGET_GOARCH}"
41+
export GOARM = "${TARGET_GOARM}"
42+
export GOCACHE = "${S}/build/.cache"
43+
export GOPATH = "${S}/build"
44+
45+
do_configure[noexec] = "1"
46+
47+
do_compile() {
48+
oe_runmake
49+
}
3850

3951
do_install() {
4052
install -d ${D}${bindir}
41-
install -m 0755 chirpstack-network-server ${D}${bindir}
53+
install -m 0755 ${S}/build/chirpstack-network-server ${D}${bindir}
4254

4355
install -d ${D}${sysconfdir}/chirpstack-network-server/config
4456
install -m 0640 ${WORKDIR}/config/* ${D}${sysconfdir}/chirpstack-network-server/config

‎layers/chirpstack/meta-chirpstack/recipes-go/go-bindata/go-bindata_git.bb‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
DESCRIPTION = "This package converts any file into managable Go source code. \
2+
Useful for embedding binary data into a go program. The file data is \
3+
optionally gzip compressed before being converted to a raw byte slice."
4+
HOMEPAGE = "https://github.com/jteeuwen/go-bindata"
5+
LICENSE = "CC0-1.0"
6+
LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=8dcedca69f7a474372829521f37954b1"
7+
8+
GO_IMPORT = "github.com/jteeuwen/go-bindata"
9+
SRC_URI = "git://${GO_IMPORT}"
10+
11+
SRCREV = "6025e8de665b31fa74ab1a66f2cddd8c0abf887e"
12+
13+
inherit go
14+
15+
GO_INSTALL = "${GO_IMPORT}/go-bindata"
16+
17+
BBCLASSEXTEND = "native nativesdk"

‎layers/chirpstack/meta-semtech/conf/layer.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
77

88
BBFILE_COLLECTIONS += "semtech"
99
BBFILE_PATTERN_semtech = "^${LAYERDIR}/"
10-
LAYERSERIES_COMPAT_semtech = "zeus"
10+
LAYERSERIES_COMPAT_semtech = "dunfell"

‎layers/chirpstack/meta-tools/conf/layer.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
77

88
BBFILE_COLLECTIONS += "tools"
99
BBFILE_PATTERN_tools = "^${LAYERDIR}/"
10-
LAYERSERIES_COMPAT_tools = "zeus"
10+
LAYERSERIES_COMPAT_tools = "dunfell"

0 commit comments

Comments
 (0)