Update recipes / fix issues after upgrade.

brocaar · brocaar · commit 14870b1e092c · 2021-08-24T09:55:10.000+01:00
diff --git a/meta/conf/distro/chirpstack-gateway-os.conf b/meta/conf/distro/chirpstack-gateway-os.conf
@@ -2,4 +2,5 @@ DISTRO = "chirpstack-gateway-os"
 DISTRO_NAME = "ChirpStack Gateway OS"
 DISTRO_VERSION = "3.4.0"
 
-EXTRA_IMAGE_FEATURES += "ssh-server-dropbear"
+DISTRO_FEATURES_append = " wifi"
+EXTRA_IMAGE_FEATURES_append = " ssh-server-dropbear"
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "chirpstack-gateway-os"
 
 BBFILE_PATTERN_chirpstack-gateway-os = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_chirpstack-gateway-os = "dunfell"
+LAYERSERIES_COMPAT_chirpstack-gateway-os = "hardknott"
 
 # Remove alsa
 MACHINE_FEATURES_remove = "alsa"
@@ -23,8 +23,13 @@ IMAGE_INSTALL_append = " kernel-image"
 IMAGE_BOOT_FILES_remove = "uImage"
 
 # Configuration for the rootfs overlay.
-INITRAMFS_IMAGE_NAME = "rootfs-overlay-initramfs-${MACHINE}"
-INITRAMFS_TASK =  "rootfs-overlay-initramfs:do_image_complete"
+# This is different than the documented way of embedding an initramfs. The
+# problem with the documented way is that it creates an additional kernel
+# image, the one installed in the rootfs is the kernel without initramfs.
+INITRAMFS_IMAGE = "rootfs-overlay-initramfs"
+INITRAMFS_IMAGE_BUNDLE="1"
+#INITRAMFS_IMAGE_NAME = "rootfs-overlay-initramfs-${MACHINE}"
+#INITRAMFS_TASK =  "rootfs-overlay-initramfs:do_image_complete"
 
 # This config option is not set for the raspberrypi machine:
 # https://github.com/agherzan/meta-raspberrypi/blob/329b50f252ed9abda98841266d126f77f3cc56a0/conf/machine/raspberrypi.conf
diff --git a/meta/recipes-chirpstack/chirpstack-application-server/chirpstack-application-server_3.16.0.bb b/meta/recipes-chirpstack/chirpstack-application-server/chirpstack-application-server_3.16.0.bb
@@ -5,11 +5,11 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5301050fd7cd58850085239d559297be"
 SRC_URI = " \
     git://git@github.com/brocaar/chirpstack-application-server.git;protocol=https;tag=v${PV}; \
+    file://chirpstack-application-server.toml \
     file://chirpstack-application-server.init \
     file://chirpstack-application-server.monit \
-    file://chirpstack-application-server.toml \
 "
-PR = "r2"
+PR = "r3"
 
 inherit update-rc.d goarch
 
@@ -18,7 +18,7 @@ INITSCRIPT_PARAMS = "defaults"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "go-native go-bindata-native nodejs-native"
+DEPENDS = "go-native nodejs-native"
 
 # Make sure that make runs one job at a time.
 PARALLEL_MAKE = ""
@@ -56,3 +56,6 @@ do_install() {
 }
 
 CONFFILES_${PN} += "${sysconfdir}/chirpstack-application-server/chirpstack-application-server.toml"
+
+# fix already stripped error
+INSANE_SKIP_${PN}_append = "already-stripped"
diff --git a/meta/recipes-chirpstack/chirpstack-gateway-bridge/chirpstack-gateway-bridge_3.12.0.bb b/meta/recipes-chirpstack/chirpstack-gateway-bridge/chirpstack-gateway-bridge_3.12.0.bb
@@ -9,7 +9,7 @@ SRC_URI = " \
     file://chirpstack-gateway-bridge.init \
     file://chirpstack-gateway-bridge.monit \
 "
-PR = "r2"
+PR = "r3"
 
 inherit update-rc.d goarch
 
@@ -54,3 +54,6 @@ do_install() {
 }
 
 CONFFILES_${PN} += "${sysconfdir}/chirpstack-gateway-bridge/chirpstack-gateway-bridge.toml"
+
+# fix already stripped error
+INSANE_SKIP_${PN}_append = "already-stripped"
diff --git a/meta/recipes-chirpstack/chirpstack-network-server/chirpstack-network-server_3.14.0.bb b/meta/recipes-chirpstack/chirpstack-network-server/chirpstack-network-server_3.14.0.bb
@@ -38,7 +38,7 @@ INITSCRIPT_PARAMS = "defaults"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "go-native go-bindata-native"
+DEPENDS = "go-native"
 
 # Make sure that make runs one job at a time.
 PARALLEL_MAKE = ""
@@ -72,3 +72,6 @@ do_install() {
     install -d ${D}${sysconfdir}/monit.d
     install -m 0644 ${WORKDIR}/chirpstack-network-server.monit ${D}${sysconfdir}/monit.d/chirpstack-network-server
 }
+
+# fix already stripped error
+INSANE_SKIP_${PN}_append = "already-stripped"
diff --git a/meta/recipes-core/images/chirpstack-gateway-os-base.bb b/meta/recipes-core/images/chirpstack-gateway-os-base.bb
@@ -4,7 +4,6 @@ require recipes-core/images/core-image-minimal.bb
 
 IMAGE_FSTYPES = "ext4.gz wic.gz"
 WKS_FILES = "chirpstack-gateway-os.wks"
-DISTRO_FEATURES += "wifi"
 
 # rng-tools is used to speed up /dev/random. This is used by Monit to generate a
 # random id. Without it, it can in some cases (Pi 4) take minutes to start up!
@@ -44,8 +43,13 @@ inherit extrausers
 
 EXTRA_USERS_PARAMS = "useradd -P admin admin;"
 
-ROOTFS_POSTPROCESS_COMMAND += "add_releaseinfo; "
+ROOTFS_POSTPROCESS_COMMAND += "add_releaseinfo; initramfs_image; "
 
 add_releaseinfo () {
     echo "${DISTRO_VERSION}" > ${IMAGE_ROOTFS}${sysconfdir}/version
 }
+
+initramfs_image() {
+	rm ${IMAGE_ROOTFS}/boot/uImage*
+	cp ${DEPLOY_DIR_IMAGE}/uImage-initramfs-${MACHINE}.bin ${IMAGE_ROOTFS}/boot/uImage
+}
diff --git a/meta/recipes-core/images/rootfs-overlay-initramfs.bb b/meta/recipes-core/images/rootfs-overlay-initramfs.bb
@@ -1,20 +1,13 @@
 DESCRIPTION = "Small image capable of mounting an overlayfs on top of a ready-only root-filesystem."
 LICENSE = "MIT"
 
-do_image_mender[noexec] = "1"
-do_image_sdimg[noexec] = "1"
-
 PACKAGE_INSTALL = "initramfs-readonly-rootfs-overlay ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
 
 # Do not pollute the initrd image with rootfs features
 IMAGE_FEATURES = ""
 IMAGE_INSTALL = ""
 IMAGE_LINGUAS = ""
 
-# Avoid dependency loops
-EXTRA_IMAGEDEPENDS = ""
-KERNELDEPMODDEPEND = ""
-
 IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
 IMAGE_ROOTFS_SIZE = "8192"
 IMAGE_ROOTFS_EXTRA_SPACE = "0"
diff --git a/meta/recipes-filesystem/initramfs-readonly-rootfs-overlay/initramfs-readonly-rootfs-overlay_1.1.0.bb b/meta/recipes-filesystem/initramfs-readonly-rootfs-overlay/initramfs-readonly-rootfs-overlay_1.1.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "Read only rootfs with overlay init script"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 SRC_URI = "file://init-readonly-rootfs-overlay-boot.sh"
-PR = "r3"
+PR = "r5"
 
 S = "${WORKDIR}"
 
@@ -15,9 +15,5 @@ do_install() {
         mknod -m 622 ${D}/dev/console c 5 1
 }
 
-
-# Due to kernel dependency
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
 FILES_${PN} += " /init /mnt/root /data /dev"
 FILES_${PN} += "/dev"
diff --git a/meta/recipes-go/go-bindata/go-bindata_git.bb b/meta/recipes-go/go-bindata/go-bindata_git.bb
diff --git a/meta/recipes-kernel/linux/files/modules.cfg b/meta/recipes-kernel/linux/files/modules.cfg
@@ -0,0 +1,10 @@
+CONFIG_OVERLAY_FS=y
+CONFIG_NET_UDP_TUNNEL=y
+CONFIG_NET_FOU=y
+CONFIG_WIREGUARD=y
+CONFIG_CRYPTO_ALGAPI=y
+
+# source: https://meta-raspberrypi.readthedocs.io/en/latest/extra-build-config.html#image-with-initramfs
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
diff --git a/meta/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta/recipes-kernel/linux/linux-raspberrypi_%.bbappend
@@ -1,11 +1,11 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
 # This will be automatically appended in u-boot based on the active partition.
 CMDLINE_remove = "root=/dev/mmcblk0p2"
 
 # Needed for the SX1302.
 KERNEL_MODULE_AUTOLOAD += "i2c-dev"
 
-do_configure_prepend() {
-    kernel_configure_variable OVERLAY_FS y
-    kernel_configure_variable CONFIG_NET_UDP_TUNNEL y
-    kernel_configure_variable NET_FOU y
-}
+SRC_URI += " \
+	file://modules.cfg \
+"
diff --git a/meta/recipes-networking/wireguard-client-config/wireguard-client-config_1.0.1.bb b/meta/recipes-networking/wireguard-client-config/wireguard-client-config_1.0.1.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 # procps is needed to work around the following wireguard error:
 # sysctl: invalid option -- 'r'
 # iproute2 is needed as busybox ip command does not implement all needed features.
-RDEPENDS_${PN} = "wireguard-tools wireguard-module procps iproute2"
+RDEPENDS_${PN} = "wireguard-tools procps iproute2"
 
 SRC_URI = " \
     file://wireguard.init \
diff --git a/meta/recipes-networking/wireguard-module/wireguard-module_%.bbappend b/meta/recipes-networking/wireguard-module/wireguard-module_%.bbappend

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ SRC_URI = " \`
`9`	`9`	`file://chirpstack-gateway-bridge.init \`
`10`	`10`	`file://chirpstack-gateway-bridge.monit \`
`11`	`11`	`"`
`12`		`-PR = "r2"`
	`12`	`+PR = "r3"`
`13`	`13`
`14`	`14`	`inherit update-rc.d goarch`
`15`	`15`
`@@ -54,3 +54,6 @@ do_install() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`CONFFILES_${PN} += "${sysconfdir}/chirpstack-gateway-bridge/chirpstack-gateway-bridge.toml"`
	`57`	`+`
	`58`	`+# fix already stripped error`
	`59`	`+INSANE_SKIP_${PN}_append = "already-stripped"`