Fix parallel make execution issue. Fix go mod permission issue.

Author: brocaar

layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-application-server/chirpstack-application-server_3.11.0.bb

@@ -9,7 +9,7 @@ SRC_URI = " \
     file://chirpstack-application-server.monit \
     file://chirpstack-application-server.toml \
 "
-PR = "r1"
+PR = "r2"
 
 inherit update-rc.d goarch
 
@@ -20,19 +20,25 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "go-native go-bindata-native nodejs-native"
 
+# Make sure that make runs one job at a time.
+PARALLEL_MAKE = ""
+
 export GOOS = "${TARGET_GOOS}"
 export GOARCH = "${TARGET_GOARCH}"
 export GOARM = "${TARGET_GOARM}"
-export GOCACHE = "${S}/build/.cache"
-export GOPATH = "${S}/build"
-
+export GOCACHE = "${WORKDIR}/go/cache"
 export HOME = "${WORKDIR}"
 
 do_configure[noexec] = "1"
 
 do_compile() {
     oe_runmake ui-requirements
-    oe_runmake
+    oe_runmake clean
+    oe_runmake build
+
+    # Clear the modcache. go mod sets the permissions such that yocto will
+    # raise permission errors when cleaning up the directory.
+    go clean -modcache
 }
 
 do_install() {

layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-gateway-bridge/chirpstack-gateway-bridge_3.9.1.bb

@@ -9,7 +9,7 @@ SRC_URI = " \
     file://chirpstack-gateway-bridge.init \
     file://chirpstack-gateway-bridge.monit \
 "
-PR = "r1"
+PR = "r2"
 
 inherit update-rc.d goarch
 
@@ -20,16 +20,23 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "go-native"
 
+# Make sure that make runs one job at a time.
+PARALLEL_MAKE = ""
+
 export GOOS = "${TARGET_GOOS}"
 export GOARCH = "${TARGET_GOARCH}"
 export GOARM = "${TARGET_GOARM}"
-export GOCACHE = "${S}/build/.cache"
-export GOPATH = "${S}/build"
+export GOCACHE = "${WORKDIR}/go/cache"
+export HOME = "${WORKDIR}"
 
 do_configure[noexec] = "1"
 
 do_compile() {
     oe_runmake
+
+    # Clear the modcache. go mod sets the permissions such that yocto will
+    # raise permission errors when cleaning up the directory.
+    go clean -modcache
 }
 
 do_install() {

layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-network-server/chirpstack-network-server_3.10.0.bb

@@ -25,7 +25,7 @@ SRC_URI = " \
     file://config/us915_6.toml \
     file://config/us915_7.toml \
 "
-PR = "r1"
+PR = "r2"
 
 inherit update-rc.d goarch
 
@@ -36,16 +36,23 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "go-native go-bindata-native"
 
+# Make sure that make runs one job at a time.
+PARALLEL_MAKE = ""
+
 export GOOS = "${TARGET_GOOS}"
 export GOARCH = "${TARGET_GOARCH}"
 export GOARM = "${TARGET_GOARM}"
-export GOCACHE = "${S}/build/.cache"
-export GOPATH = "${S}/build"
+export GOCACHE = "${WORKDIR}/go/cache"
+export HOME = "${WORKDIR}"
 
 do_configure[noexec] = "1"
 
 do_compile() {
     oe_runmake
+
+    # Clear the modcache. go mod sets the permissions such that yocto will
+    # raise permission errors when cleaning up the directory.
+    go clean -modcache
 }
 
 do_install() {

meta/conf/distro/chirpstack-gateway-os.conf

@@ -1,5 +1,5 @@
 DISTRO = "chirpstack-gateway-os"
 DISTRO_NAME = "ChirpStack Gateway OS"
-DISTRO_VERSION = "3.3.0-test.7"
+DISTRO_VERSION = "3.3.0-test.8"
 
 EXTRA_IMAGE_FEATURES += "ssh-server-dropbear"