distro/netmodule-linux: Mark debian 12 as valid build host

distro/netmodule-linux: Make build sstate compatible with all HOSTs
packagegroup-nm-net: Replace bare openvpn by NetworkManager integration
2023-06-21 10:54:26 +02:00 · 2023-06-21 10:53:38 +02:00 · 2023-04-19 16:05:28 +02:00 · 2023-03-24 17:42:14 +01:00 · 2023-03-10 15:34:58 +01:00 · 2022-12-13 13:15:19 +01:00
59 changed files with 177 additions and 219 deletions
--- a/backports/networking-layer/recipes-support/vnstat/vnstat_2.6.bb
+++ b/backports/networking-layer/recipes-support/vnstat/vnstat_2.6.bb
@ -1,6 +1,6 @@
 DESCRIPTION = "vnStat is a console-based network traffic monitor for Linux and BSD that keeps a log of network traffic for the selected interface(s)."
 HOMEPAGE = "https://humdi.net/vnstat/"
-LICENSE = "GPL-2.0-only"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SECTION = "net"
 DEPENDS = "gd sqlite3"
@ -13,7 +13,7 @@ inherit autotools pkgconfig systemd

 EXTRA_OECONF = "--disable-extra-paths"

-do_configure:append() {
+do_configure_append() {
    # enable a volatile and persistent path for reading and writing the data base:
    sed -i 's|ReadWritePaths=\/var\/lib|ReadWritePaths=\/var\/lib \/run\/|g' ${S}/examples/systemd/vnstat.service

@ -25,8 +25,8 @@ do_configure:append() {
 }


-do_install:append() {
+do_install_append() {
    install -Dm644 ${S}/examples/systemd/vnstat.service "${D}${systemd_system_unitdir}/vnstat.service"
 }

-SYSTEMD_SERVICE:${PN} = "vnstat.service"
+SYSTEMD_SERVICE_${PN} = "vnstat.service"
--- a/backports/openembedded-layer/recipes-extended/ethtool/ethtool_5.13.bb
+++ b/backports/openembedded-layer/recipes-extended/ethtool/ethtool_5.13.bb
@ -2,7 +2,7 @@ SUMMARY = "Display or change ethernet card settings"
 DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces."
 HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/"
 SECTION = "console/network"
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                    file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216"

--- a/backports/openembedded-layer/recipes-extended/tmate/tmate_2.4.0.bb
+++ b/backports/openembedded-layer/recipes-extended/tmate/tmate_2.4.0.bb
@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f7d9aab84ec6567139a4755c48d147fb"

 DEPENDS:append = " libevent libssh msgpack-c ncurses"
 SRC_URI = "\
-    git://github.com/tmate-io/tmate.git;protocol=https;branch=master \
+    git://github.com/tmate-io/tmate.git;protocol=https \
 "

 SRCREV = "5e00bfa5e137e76c81888727712ced2b3fd99f5b"
--- a/bbappends/core/recipes-core/base-files/base-files_%.bbappend
+++ b/bbappends/core/recipes-core/base-files/base-files_%.bbappend
@ -1,8 +1,8 @@
 BASEFILESISSUEINSTALL =  "do_install_basefilesissue"

 DISTROVERSION-ISSUE = "\S{PRETTY_NAME}\n"
-DISTROVERSION-ISSUE:append= "kernel \\\r\n"
-DISTROVERSION-ISSUE:append = "\\\n @ \\\l\n"
+DISTROVERSION-ISSUE_append= "kernel \\\r\n"
+DISTROVERSION-ISSUE_append = "\\\n @ \\\l\n"

 #r: kernel version
 #n: hostname
--- a/bbappends/core/recipes-core/busybox/busybox_%.bbappend
+++ b/bbappends/core/recipes-core/busybox/busybox_%.bbappend
@ -5,7 +5,7 @@
 #
 # More details can be found in the Kernel Dev Manual
 # http://www.yoctoproject.org/docs/current/kernel-dev/kernel-dev.html#changing-the-configuration
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

 SRC_URI += " \
    file://no_rfkill.cfg \
--- a/bbappends/core/recipes-core/systemd/systemd-conf_%.bbappend
+++ b/bbappends/core/recipes-core/systemd/systemd-conf_%.bbappend
@ -1,6 +1,6 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

-do_install:append() {
+do_install_append() {
    # Remove default network configurations
    rm -rf ${D}${systemd_unitdir}/network
 }
--- a/bbappends/core/recipes-core/systemd/systemd_%.bbappend
+++ b/bbappends/core/recipes-core/systemd/systemd_%.bbappend
@ -1,8 +1,8 @@
-PACKAGECONFIG:remove = "nss-resolve resolved"
-ALTERNATIVE:${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}"
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+PACKAGECONFIG_remove = "nss-resolve resolved"
+ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

-SRC_URI:append = " \
+SRC_URI_append = " \
                 file://journald.conf \
                 "

@ -10,9 +10,9 @@ SRC_URI:append = " \
 # Having this dependency leads to a rebuild of systemd when os-release is rebuilt,
 # even when the recommendations are excluded.
 # It may not be required with future releases of yocto.
-RRECOMMENDS:${PN}:remove = "os-release"
+RRECOMMENDS_${PN}_remove = "os-release"

-do_install:append() {
+do_install_append() {
    # Remove default network configurations
    rm -rf ${D}${systemd_unitdir}/network

--- a/bbappends/core/recipes-devtools/python/python3_%.bbappend
+++ b/bbappends/core/recipes-devtools/python/python3_%.bbappend
@ -1,11 +0,0 @@
-PACKAGE_PREPROCESS_FUNCS += "${@ 'clean_pycache' if not bb.utils.to_boolean(d.getVar('INCLUDE_PYCS')) else '' }"
-
-clean_pycache(){
-    find ${PKGD} | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf
-}
-
-do_install:append(){
-    cd ${D}${libdir}/python${PYTHON_MAJMIN}
-    rm -rf turtle.py turtledemo/
-    cd -
-}
--- a/bbappends/core/recipes-support/curl/curl_%.bbappend
+++ b/bbappends/core/recipes-support/curl/curl_%.bbappend
@ -1 +0,0 @@
-PACKAGECONFIG:append = " tftp"
--- a/bbappends/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bbappend
+++ b/bbappends/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bbappend
@ -0,0 +1 @@
+SRCREV = "42e96b13dda2afabbcec2622612d13495a415caa"
--- a/bbappends/networking-layer/recipes-support/chrony/chrony_%.bbappend
+++ b/bbappends/networking-layer/recipes-support/chrony/chrony_%.bbappend
@ -1,8 +1,8 @@
 # Copyright (C) 2020 Ramon Moesching <ramon.moesching@netmodule.com>
 # Released under the MIT license (see COPYING.MIT for the terms)
-FILESEXTRAPATHS:prepend:= "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend:= "${THISDIR}/files:"

-do_install:append () {
+do_install_append () {
 	if ${@bb.utils.contains("MACHINE_FEATURES", "pps", "true", "false", d)}; then
 		sed -i '/^#refclock PPS.*/s/^#//' ${D}/${sysconfdir}/chrony.conf
 	fi
@ -12,7 +12,7 @@ do_install:append () {
 # thus gpsd daemon needs to start with -n paramteter.
 # Patching at installation time gpsd configuration file
 # to apply this parameter
-pkg_postinst:${PN}:prepend () {
+pkg_postinst_${PN}_prepend () {

 	GPSD_CONF=$D${sysconfdir}/default/gpsd.default

--- a/bbappends/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend
+++ b/bbappends/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend
@ -1,8 +1,8 @@
-PACKAGECONFIG:append = " dbus"
+PACKAGECONFIG_append = " dbus"


 SYSTEMD_AUTO_ENABLE = "disable"

-do_install:append () {
+do_install_append () {
    install -d ${D}${localstatedir}/lib/misc/
 }
--- a/bbappends/openembedded-layer/recipes-extended/haveged/haveged_%.bbappend
+++ b/bbappends/openembedded-layer/recipes-extended/haveged/haveged_%.bbappend
@ -1,3 +1,3 @@
-FILESEXTRAPATHS:prepend:= "${THISDIR}/patches:"
+FILESEXTRAPATHS_prepend:= "${THISDIR}/patches:"

-SRC_URI:prepend_mx8 = " file://start-daemon-with-data-arg-16.patch "
+SRC_URI_prepend_mx8 = " file://start-daemon-with-data-arg-16.patch "
--- a/bbappends/sota/recipes-core/images/initramfs-ostree-image.bbappend
+++ b/bbappends/sota/recipes-core/images/initramfs-ostree-image.bbappend
@ -1,3 +1,3 @@
-ROOTFS_BOOTSTRAP_INSTALL:append = " \
+ROOTFS_BOOTSTRAP_INSTALL_append = " \
 	packagegroup-nm-wifi-minimal \
 	"
--- a/bbappends/sota/recipes-sota/ostree-initrd/files/0001-Remove-log-info-from-init.patch
+++ b/bbappends/sota/recipes-sota/ostree-initrd/files/0001-Remove-log-info-from-init.patch
@ -1,52 +1,51 @@
-diff --git a/init.sh
-index 4818a07..c2b2c64 100644
+diff --git a/init.sh b/init.sh
+index e599451..ab6e016 100644
 --- a/init.sh
 +++ b/init.sh
-@@ -3,20 +3,17 @@ set -eu
- 
- # -------------------------------------------
+@@ -1,20 +1,17 @@
+ #!/bin/sh
+ set -eu
 
 -log_info() { echo "$0[$$]: $*" >&2; }
 log_error() { echo "$0[$$]: ERROR $*" >&2; }
 
 do_mount_fs() {
-	log_info "mounting FS: $*"
- 	[[ -e /proc/filesystems ]] && { grep -q "$1" /proc/filesystems || { log_error "Unknown filesystem"; return 1; } }
- 	[[ -d "$2" ]] || mkdir -p "$2"
-	[[ -e /proc/mounts ]] && { grep -q -e "^$1 $2 $1" /proc/mounts && { log_info "$2 ($1) already mounted"; return 0; } }
-+	[[ -e /proc/mounts ]] && { grep -q -e "^$1 $2 $1" /proc/mounts && { return 0; } }
- 	mount -t "$1" "$1" "$2"
+-  log_info "mounting FS: $*"
+   [ -e /proc/filesystems ] && { grep -q "$1" /proc/filesystems || { log_error "Unknown filesystem"; return 1; } }
+   [ -d "$2" ] || mkdir -p "$2"
+-  [ -e /proc/mounts ] && { grep -q -e "^$1 $2 $1" /proc/mounts && { log_info "$2 ($1) already mounted"; return 0; } }
+  [ -e /proc/mounts ] && { grep -q -e "^$1 $2 $1" /proc/mounts && { return 0; } }
+   mount -t "$1" "$1" "$2"
 }
 
 bail_out() {
- 	log_error "$@"
-	log_info "Rebooting..."
- 	#exec reboot -f
- 	exec sh
+   log_error "$@"
+-  log_info "Rebooting..."
+   #exec reboot -f
+   exec sh
 }
-@@ -34,7 +31,6 @@ get_ostree_sysroot() {
+@@ -33,8 +30,6 @@ get_ostree_sysroot() {
 
 export PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/ostree
 
 -log_info "Starting OSTree initrd script"
- 
+-
 do_mount_fs proc /proc
 do_mount_fs sysfs /sys
-@@ -58,14 +54,13 @@ ostree_sysroot=$(get_ostree_sysroot)
+ do_mount_fs devtmpfs /dev
+@@ -57,14 +52,12 @@ ostree_sysroot=$(get_ostree_sysroot)
 mount "$ostree_sysroot" /sysroot || {
- 	# The SD card in the R-Car M3 takes a bit of time to come up
- 	# Retry the mount if it fails the first time
-	log_info "Mounting $ostree_sysroot failed, waiting 5s for the device to be available..."
- 	sleep 5
- 	mount "$ostree_sysroot" /sysroot || bail_out "Unable to mount $ostree_sysroot as physical sysroot"
+   # The SD card in the R-Car M3 takes a bit of time to come up
+   # Retry the mount if it fails the first time
+-  log_info "Mounting $ostree_sysroot failed, waiting 5s for the device to be available..."
+   sleep 5
+   mount "$ostree_sysroot" /sysroot || bail_out "Unable to mount $ostree_sysroot as physical sysroot"
 }
 
 -ostree-prepare-root /sysroot
 +ostree-prepare-root /sysroot > /dev/null 2>&1
-+
 
 -log_info "Switching to rootfs"
+ # shellcheck disable=SC2093
 exec switch_root /sysroot /sbin/init
 
- bail_out "Failed to switch_root to $ostree_sysroot"
-
--- a/bbappends/sota/recipes-sota/ostree-initrd/ostree-initrd.bbappend
+++ b/bbappends/sota/recipes-sota/ostree-initrd/ostree-initrd.bbappend
@ -1,3 +1,3 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

 SRC_URI += "file://0001-Remove-log-info-from-init.patch"
--- a/conf/distro/netmodule-linux-minimal.conf
+++ b/conf/distro/netmodule-linux-minimal.conf
@ -2,12 +2,11 @@ require netmodule-linux.conf
 DISTRO = "netmodule-linux-minimal"
 DISTRO_VARIANT = " for minimal fitImage"

-INCLUDE_PYCS:pn-python3 = "0"
-
-#export SOURCE_DATE_EPOCH ?= "0"
-#REPRODUCIBLE_TIMESTAMP_ROOTFS = ""
+INHERIT += "reproducible_build_simple"
+export SOURCE_DATE_EPOCH ?= "0"
+REPRODUCIBLE_TIMESTAMP_ROOTFS = ""

 PREFERRED_PROVIDER_virtual/netmodule-image = "netmodule-fitimage"
-INITRAMFS_IMAGE:pn-netmodule-fitimage = "netmodule-linux-image-minimal"
+INITRAMFS_IMAGE_pn-netmodule-fitimage = "netmodule-linux-image-minimal"

 IMAGE_FSTYPES = "cpio.gz cpio.gz.u-boot"
--- a/conf/distro/netmodule-linux-ostree.conf
+++ b/conf/distro/netmodule-linux-ostree.conf
@ -1,5 +1,5 @@
-require conf/distro/sota.conf.inc
 require netmodule-linux.conf
+require conf/distro/sota.conf.inc
 DISTRO = "netmodule-linux-ostree"
 DISTRO_VARIANT = " with ostree"

@ -12,7 +12,7 @@ OSTREE_INITRAMFS_FSTYPES = "ext4.gz.u-boot"
 OSTREE_COMMIT_SUBJECT = "${IMAGE_BASENAME};${DISTRO_VERSION}"

 # Unneeded tools added by sota class
-IMAGE_INSTALL:remove = "aktualizr aktualizr-info"
+IMAGE_INSTALL_remove = "aktualizr aktualizr-info"

 SOTA_CLIENT = " "
 SOTA_CLIENT_PROV = " "
--- a/conf/distro/netmodule-linux.conf
+++ b/conf/distro/netmodule-linux.conf
@ -1,11 +1,14 @@
 # Global
-
 TARGET_VENDOR = "-netmodule"
 SANITY_TESTED_DISTROS ?= " \
            debian-10 \n \
            debian-11 \n \
+            debian-12 \n \
            "

+# Make shared states compatible with all build host
+require conf/distro/include/yocto-uninative.inc
+INHERIT += "uninative"
 # Don't append libc name in tmp directory
 # eg. build/tmp instead of build/tmp-glibc
 # Since we only support glibc, we don't need different tmp directories
@ -17,8 +20,6 @@ DISTRO = "netmodule-linux"
 DISTRO_NAME = "NetModule Linux Distribution"
 DISTRO_VERSION ?= "x.y.z.develop"

-export SOURCE_DATE_EPOCH = "1656633600"
-
 INIT_MANAGER = "systemd"
 KERNEL_MODULE_AUTOLOAD += "cryptodev"

@ -27,23 +28,22 @@ DISTRO_FEATURES = "bluetooth usbhost pci ipv4 ipv6 wifi multiarch usrmerge"
 # The BACKFILLed features are features which were defaults in previous
 # yocto versions but are now optional.
 # Adding them to this variable allow us to remove them.
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio ldconfig"
+DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio gobject-introspection-data ldconfig"

-EXTRA_IMAGECMD:append_ext4 = " -O ^64bit"
-EXTRA_IMAGECMD:append_ota-ext4 = " -O ^64bit"
+EXTRA_IMAGECMD_append_ext4 = " -O ^64bit"
+EXTRA_IMAGECMD_append_ota-ext4 = " -O ^64bit"


 # Packages
-PACKAGECONFIG:append:pn-curl = " openssl"
-PACKAGECONFIG:remove:pn-curl = "gnutls"
+PACKAGECONFIG_append_pn-curl = " tftp ssl"
+PACKAGECONFIG_remove_pn-curl = "gnutls"

-PACKAGECONFIG:append:pn-wget = " openssl"
-PACKAGECONFIG:remove:pn-wget = "gnutls"
-
-PACKAGECONFIG:append:pn-libgpiod = " python3"
-PACKAGECONFIG:append:pn-networkmanager = " modemmanager"
-PACKAGECONFIG:pn-gpsd = ""
-PACKAGECONFIG:append:pn-openssl = " cryptodev-linux"
+PACKAGECONFIG_append_pn-libgpiod = " python3"
+PACKAGECONFIG_append_pn-networkmanager = " modemmanager"
+PACKAGECONFIG_pn-gpsd = ""
+PACKAGECONFIG_append_pn-openssl = " cryptodev-linux"
+PACKAGECONFIG_pn-lmsensors = ""
+PACKAGECONFIG_pn-libqmi = ""

 # These rules may make gpsd start automatically when detecting a
 # receiver. We don't want that since gpsd is started by gnss-mgr
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -19,4 +19,4 @@ LAYERVERSION_netmodule-distro = "1"

 LAYERDEPENDS_netmodule-distro = "core"

-LAYERSERIES_COMPAT_netmodule-distro = "dunfell kirkstone"
+LAYERSERIES_COMPAT_netmodule-distro = "dunfell"
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@ -1,25 +1,25 @@
 BB_NUMBER_THREADS ?= "4"
 PARALLEL_MAKE ?= "-j 4"
 PACKAGE_CLASSES ?= "package_rpm"
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 PATCHRESOLVE = "noop"
 BB_DISKMON_DIRS = "\
    STOPTASKS,${TMPDIR},1G,100K \
    STOPTASKS,${DL_DIR},1G,100K \
    STOPTASKS,${SSTATE_DIR},1G,100K \
    STOPTASKS,/tmp,100M,100K \
-    HALT,${TMPDIR},100M,1K \
-    HALT,${DL_DIR},100M,1K \
-    HALT,${SSTATE_DIR},100M,1K \
-    HALT,/tmp,10M,1K"
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
 ASSUME_PROVIDED += "libsdl-native"
 CONF_VERSION = "1"
-EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
+EXTRA_IMAGE_FEATURES_append = " debug-tweaks"

 INHERIT += "rm_work"

-ERROR_QA:remove = "version-going-backwards"
-WARN_QA:append = " version-going-backwards"
+ERROR_QA_remove += "version-going-backwards"
+WARN_QA_append += "version-going-backwards"

 INHERIT += "buildhistory"
 BUILDHISTORY_COMMIT = "1"
--- a/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu.bb
+++ b/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu.bb
@ -1,6 +1,6 @@
 DESCRIPTION = "CPU Benchmarking bin"
 HOMEPAGE = "http://www.netmodule.com/"
-LICENSE = "GPL-2.0-only"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"

 PROVIDES = "benchmarking-cpu"
@ -13,7 +13,7 @@ SRC_URI = " \
           file://memspeed \
           "

-FILES:${PN} += "/usr/bin/*"
+FILES_${PN} += "/usr/bin/*"

 S = "${WORKDIR}"

--- a/recipes-core/images/netmodule-linux-image-dev.bb
+++ b/recipes-core/images/netmodule-linux-image-dev.bb
@ -2,7 +2,7 @@ require netmodule-linux-image.bb

 SUMMARY = "netmodule image for developement only"

-IMAGE_FEATURES:append = " \
+IMAGE_FEATURES_append = " \
                tools-debug \
                "

@ -36,12 +36,12 @@ EASY_EDITOR = " \
                nano \
              "

-BENCH_TOOLS_cortexa9hf-neon:append = " cpuburn-neon "
-BENCH_TOOLS_cortexa8hf-neon:append = " cpuburn-neon "
+BENCH_TOOLS_cortexa9hf-neon_append = " cpuburn-neon "
+BENCH_TOOLS_cortexa8hf-neon_append = " cpuburn-neon "

-IMAGE_INSTALL:remove:aarch64 = "benchmarking-cpu"
+IMAGE_INSTALL_remove_aarch64 = "benchmarking-cpu"

-IMAGE_INSTALL:append = " \
+IMAGE_INSTALL_append = " \
                lrzsz \
                ${BENCH_TOOLS} \
                ${EASY_EDITOR} \
--- a/recipes-core/images/netmodule-linux-image.bb
+++ b/recipes-core/images/netmodule-linux-image.bb
@ -5,7 +5,7 @@ require includes/image-preprocessing.inc
 SUMMARY = "NetModule Linux Distro Image"
 PROVIDES += "virtual/netmodule-image"

-IMAGE_FEATURES:append = " \
+IMAGE_FEATURES_append = " \
                package-management \
                "

@ -16,7 +16,7 @@ IMAGE_INSTALL = " \
                "


-IMAGE_INSTALL:append:sota = " mount-overlay"
+IMAGE_INSTALL_append_sota = " mount-overlay"

 LICENSE = "BSD"

--- a/recipes-core/packagegroups-features/packagegroup-feature.inc
+++ b/recipes-core/packagegroups-features/packagegroup-feature.inc
@ -2,6 +2,6 @@ inherit packagegroup

 PACKAGES = "${PN}-minimal ${PN}-base ${PN}-extended"

-SUMMARY:${PN}-minimal = "Minimal packages for ${PN}"
-SUMMARY:${PN}-base = "Base packages for ${PN}"
-SUMMARY:${PN}-extended = "Extended packages for ${PN}"
+SUMMARY_${PN}-minimal = "Minimal packages for ${PN}"
+SUMMARY_${PN}-base = "Base packages for ${PN}"
+SUMMARY_${PN}-extended = "Extended packages for ${PN}"
--- a/recipes-core/packagegroups-features/packagegroup-nm-bluetooth.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-bluetooth.bb
@ -5,12 +5,11 @@ require packagegroup-feature.inc

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-RDEPENDS:${PN}-base = " \
-	networkmanager-bluetooth \
+RDEPENDS_${PN}-base = " \
 	${@bb.utils.contains("MACHINE_FEATURES", "tibluetooth", "tibluetooth", "", d)} \
 	"

-RDEPENDS:${PN}-extended = " \
+RDEPENDS_${PN}-extended = " \
 	bluez5-obex \
 	bluez5-noinst-tools \
 	"
--- a/recipes-core/packagegroups-features/packagegroup-nm-boot-tools.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-boot-tools.bb
@ -5,6 +5,6 @@ require packagegroup-feature.inc

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-RDEPENDS:${PN}-extended = " \
+RDEPENDS_${PN}-extended = " \
 	${@bb.utils.contains("MACHINE_FEATURES", "imx-boot", "", "bootloader-config", d)} \
 	"
--- a/recipes-core/packagegroups-features/packagegroup-nm-can.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-can.bb
@ -3,10 +3,10 @@ LICENSE = "MIT"

 require packagegroup-feature.inc

-RDEPENDS:${PN}-base = " \
+RDEPENDS_${PN}-base = " \
 	can-utils \
 	"

-RDEPENDS:${PN}-extended = " \
+RDEPENDS_${PN}-extended = " \
 	cannelloni \
 	"
--- a/recipes-core/packagegroups-features/packagegroup-nm-fpga.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-fpga.bb
@ -3,6 +3,6 @@ LICENSE = "MIT"

 require packagegroup-feature.inc

-RDEPENDS:${PN}-base = " \
+RDEPENDS_${PN}-base = " \
 	fpga-image \
 	"
--- a/recipes-core/packagegroups-features/packagegroup-nm-gnss.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-gnss.bb
@ -6,7 +6,7 @@ require packagegroup-feature.inc

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-RDEPENDS:${PN}-extended = " \
+RDEPENDS_${PN}-extended = " \
 	gpsd \
 	gpsd-conf \
 	gps-utils \
--- a/recipes-core/packagegroups-features/packagegroup-nm-imu.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-imu.bb
@ -3,6 +3,6 @@ LICENSE = "MIT"

 require packagegroup-feature.inc

-RDEPENDS:${PN}-extended = " \
+RDEPENDS_${PN}-extended = " \
 	imu-setup \
 	"
--- a/recipes-core/packagegroups-features/packagegroup-nm-net.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-net.bb
@ -4,23 +4,22 @@ LICENSE = "MIT"
 require packagegroup-feature.inc

 # less is needed for nmcli to show proper output
-RDEPENDS:${PN}-minimal = " \
+RDEPENDS_${PN}-minimal = " \
 	networkmanager \
-	networkmanager-nmcli \
 	less \
 	"

-RDEPENDS:${PN}-base = " \
+RDEPENDS_${PN}-base = " \
 	iproute2 \
 	packagegroup-core-ssh-openssh \
 	openssh-sftp-server \
+	ethtool \
 	"

-RDEPENDS:${PN}-extended= " \
-	ethtool \
+RDEPENDS_${PN}-extended= " \
 	iptables \
 	iptables-module-ipt-masquerade \
 	iptables-module-ip6t-masquerade \
 	bridge-utils \
-	openvpn \
+	networkmanager-openvpn \
 	"
--- a/recipes-core/packagegroups-features/packagegroup-nm-spi.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-spi.bb
@ -3,6 +3,6 @@ LICENSE = "MIT"

 require packagegroup-feature.inc

-RDEPENDS:${PN}-base = " \
+RDEPENDS_${PN}-base = " \
 	spitools \
 	"
--- a/recipes-core/packagegroups-features/packagegroup-nm-time.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-time.bb
@ -3,7 +3,7 @@ LICENSE = "MIT"

 require packagegroup-feature.inc

-RDEPENDS:${PN}-extended = " \
+RDEPENDS_${PN}-extended = " \
 	util-linux-rtcwake \
 	chrony \
 	chronyc \
--- a/recipes-core/packagegroups-features/packagegroup-nm-user-module.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-user-module.bb
@ -3,6 +3,6 @@ LICENSE = "MIT"

 require packagegroup-feature.inc

-RDEPENDS:${PN}-base = " \
+RDEPENDS_${PN}-base = " \
 	socket-uart \
 	"
--- a/recipes-core/packagegroups-features/packagegroup-nm-v2x.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-v2x.bb
@ -3,6 +3,6 @@ LICENSE = "MIT"

 require packagegroup-feature.inc

-RDEPENDS:${PN}-extended = " \
+RDEPENDS_${PN}-extended = " \
 	v2x-ieee802.11p \
 	"
--- a/recipes-core/packagegroups-features/packagegroup-nm-wakeup-timer.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-wakeup-timer.bb
@ -3,6 +3,6 @@ LICENSE = "MIT"

 require packagegroup-feature.inc

-RDEPENDS:${PN}-extended = " \
+RDEPENDS_${PN}-extended = " \
 	wakeup-timer \
 	"
--- a/recipes-core/packagegroups-features/packagegroup-nm-wifi.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-wifi.bb
@ -23,16 +23,13 @@ UBLOX_WIFI = " \
 	"


-RDEPENDS:${PN}-minimal = " \
+RDEPENDS_${PN}-minimal = " \
 	${@bb.utils.contains("MACHINE_FEATURES", "ti-wifi", "${TI_WIFI}", "", d)} \
 	${@bb.utils.contains("MACHINE_FEATURES", "ath-wifi", "${ATH_WIFI}", "", d)} \
 	${@bb.utils.contains("MACHINE_FEATURES", "ublox-wifi", "${UBLOX_WIFI}", "", d)} \
 	"

-RDEPENDS:${PN}-base = " \
-	networkmanager-wifi \
-	"

-RDEPENDS:${PN}-extended = " \
+RDEPENDS_${PN}-extended = " \
 	hostapd \
 	"
--- a/recipes-core/packagegroups-features/packagegroup-nm-wwan.bb
+++ b/recipes-core/packagegroups-features/packagegroup-nm-wwan.bb
@ -3,11 +3,7 @@ LICENSE = "MIT"

 require packagegroup-feature.inc

-RDEPENDS:${PN}-base = " \
-	networkmanager-wwan \
-	"
-
-RDEPENDS:${PN}-extended = " \
+RDEPENDS_${PN}-extended = " \
 	modemmanager \
 	wwan-config \
 	"
--- a/recipes-core/packagegroups-sets/packagegroup-nm-base.bb
+++ b/recipes-core/packagegroups-sets/packagegroup-nm-base.bb
@ -4,7 +4,7 @@ LICENSE = "MIT"
 require packagegroup-nm.inc
 FEATURE_LEVEL = "base"

-RDEPENDS:${PN} = " \
+RDEPENDS_${PN} = " \
 	packagegroup-nm-minimal \
 	bash \
 	curl \
--- a/recipes-core/packagegroups-sets/packagegroup-nm-extended.bb
+++ b/recipes-core/packagegroups-sets/packagegroup-nm-extended.bb
@ -4,7 +4,7 @@ LICENSE = "MIT"
 require packagegroup-nm.inc
 FEATURE_LEVEL = "extended"

-RDEPENDS:${PN} = " \
+RDEPENDS_${PN} = " \
 	packagegroup-nm-base \
 	packagegroup-base \
 	nmhw-auto-part \
@ -22,7 +22,7 @@ RDEPENDS:${PN} = " \
 	"

 # Hacks for V2X-GNSS-HUB power sequence on HW23
-RDEPENDS:${PN}:append_imx8-nmhw23 = " \
+RDEPENDS_${PN}_append_imx8-nmhw23 = " \
 	usb-hub-reset \
 	gnss-init \
 	"
--- a/recipes-core/packagegroups-sets/packagegroup-nm-minimal.bb
+++ b/recipes-core/packagegroups-sets/packagegroup-nm-minimal.bb
@ -4,7 +4,7 @@ LICENSE = "MIT"
 require packagegroup-nm.inc
 FEATURE_LEVEL = "minimal"

-RDEPENDS:${PN} = " \
+RDEPENDS_${PN} = " \
 	packagegroup-core-boot \
 	util-linux-agetty \
 	systemd-serialgetty \
--- a/recipes-core/packagegroups-sets/packagegroup-nm.inc
+++ b/recipes-core/packagegroups-sets/packagegroup-nm.inc
@ -3,7 +3,7 @@ inherit packagegroup
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 # FEATURE_LEVEL must be defined by including file

-RDEPENDS:${PN}:append = " \
+RDEPENDS_${PN}_append = " \
 	\
 	packagegroup-nm-net-${FEATURE_LEVEL} \
 	packagegroup-nm-boot-tools-${FEATURE_LEVEL} \
--- a/recipes-core/sdk/netmodule-linux-sdk.bb
+++ b/recipes-core/sdk/netmodule-linux-sdk.bb
@ -4,8 +4,9 @@ LICENSE = "MIT"

 inherit populate_sdk

-TOOLCHAIN_TARGET_TASK:append = " \
+TOOLCHAIN_TARGET_TASK_append = " \
    cpputest-staticdev \
    libnmapp-staticdev \
+    libc-staticdev \
 "

--- a/recipes-devtools/java-se-embedded/java-ejdk_1.8.0.bb
+++ b/recipes-devtools/java-se-embedded/java-ejdk_1.8.0.bb
@ -15,7 +15,7 @@ BUILD_NUMBER = "11"
 JVM_VERSION = "compact1"


-FILESEXTRAPATHS:append := ":${THISDIR}/download"
+FILESEXTRAPATHS_append := ":${THISDIR}/download"

 LIC_FILES_CHKSUM = "file://${WORKDIR}/ejdk1.8.0_${PV_UPDATE}/linux_armv6_vfp_hflt/compact1/COPYRIGHT;md5=a762796b2a8989b8952b653a178607a1"
 LICENSE = "Oracle_Binary_Code_License_Agreement"
@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "5dcc644c999e7109efe46669ac717f3b96f3bbdeac3cb66f072ca4dfbc
 S = "${WORKDIR}"


-FILES:${PN} = "${bindir}/*"
+FILES_${PN} = "${bindir}/*"

 do_install() {
 	install -d ${D}${bindir}/ejdk1.8.0
@ -39,6 +39,6 @@ do_install() {
 }


-INSANE_SKIP:${PN} += "dev-so already-stripped ldflags file-rdeps "
+INSANE_SKIP_${PN} += "dev-so already-stripped ldflags file-rdeps "

 EXCLUDE_FROM_SHLIBS = "1"
--- a/recipes-extended/imu-setup/imu-setup_0.0.1.bb
+++ b/recipes-extended/imu-setup/imu-setup_0.0.1.bb
@ -3,9 +3,9 @@
 inherit systemd
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-FILESEXTRAPATHS:prepend := "${THISDIR}/config:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/config:"

-RDEPENDS:${PN} = "bash"
+RDEPENDS_${PN} = "bash"

 SRC_URI = " \
            file://imu-setup.service \
@ -14,9 +14,9 @@ SRC_URI = " \
            file://imu-lsm6ds3.conf \
          "

-FILES:${PN} = "${systemd_unitdir}/system ${bindir} /etc"
+FILES_${PN} = "${systemd_unitdir}/system ${bindir} /etc"

-SYSTEMD_SERVICE:${PN} =" \
+SYSTEMD_SERVICE_${PN} =" \
                            imu-setup.service \
                        "

--- a/recipes-extended/mount-overlay/mount-overlay.bb
+++ b/recipes-extended/mount-overlay/mount-overlay.bb
@ -15,10 +15,10 @@ S = "${WORKDIR}"

 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"

-SYSTEMD_SERVICE:${PN} = "mount-overlay.service"
+SYSTEMD_SERVICE_${PN} = "mount-overlay.service"
 SYSTEMD_AUTO_ENABLE ?= "enable"

-FILES:${PN}:append = " \
+FILES_${PN}_append = " \
                    /lib \
                    /usr \
                    "
--- a/recipes-testing/cpputest/cpputest_git.bb
+++ b/recipes-testing/cpputest/cpputest_git.bb
@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177"

 inherit autotools

-SRC_URI = "git://github.com/cpputest/cpputest.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/cpputest/cpputest.git;protocol=https"
 SRCREV = "bbe3801b990d281cf251cc6e6107256808ea6d19"

 PV = "3.8+git${SRCPV}"
@ -15,6 +15,6 @@ S = "${WORKDIR}/git"
 # Required to add the libary to the SDK.
 # ${PN}-dev depends on ${PN} which is empty because
 # only the static library is built
-ALLOW_EMPTY:${PN} = "1"
+ALLOW_EMPTY_${PN} = "1"

 BBCLASSEXTEND = "native nativesdk"
--- a/recipes-testing/ti-utils/ti-wl18xx-calibrator/0001-Remove-variable-defined-in-header-file.patch
+++ b/recipes-testing/ti-utils/ti-wl18xx-calibrator/0001-Remove-variable-defined-in-header-file.patch
@ -1,25 +0,0 @@
-From 061f3fda77feb2f7c8e111c5e169d460893f7210 Mon Sep 17 00:00:00 2001
-From: Alexandre Bard <alexandre.bard@netmodule.com>
-Date: Thu, 4 Aug 2022 13:49:17 +0200
-Subject: [PATCH] Remove variable defined in header file
-
-linker is complaining about multiple definitions of this variable.
-
-Signed-off-by: Alexandre Bard <alexandre.bard@netmodule.com>
---
- plt.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plt.h b/plt.h
-index 8b534a9..43d5dbc 100644
--- a/plt.h
-+++ b/plt.h
-@@ -399,7 +399,7 @@ enum EFUSE_PARAMETER_TYPE_ENMT {
- 	TX_BIP_PD_BUFFER_VBIAS_ERROR_E,
- 	EFUSE_NUMBER_OF_PARAMETERS_E,
- 	EFUSE_LAST_PARAMETER_E = (EFUSE_NUMBER_OF_PARAMETERS_E - 1)
-} EFUSE_PARAMETER_TYPE_ENM;
-+};
- 
- int get_mac_addr(int ifc_num, unsigned char *mac_addr);
- 
--- a/recipes-testing/ti-utils/ti-wl18xx-calibrator_git.bb
+++ b/recipes-testing/ti-utils/ti-wl18xx-calibrator_git.bb
@ -1,5 +1,5 @@
 DESCRIPTION = "Configuration utility for TI wireless drivers"
-LICENSE = "GPL-2.0-only"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://README;md5=df1ae7fbe1a166f497f944d67efbf088"

 # Based on TI meta-arago-extras
@ -10,9 +10,7 @@ PV = "R8.7+git${SRCPV}"
 PR = "r1"

 SRCREV = "39542357111d1f24e866c2857d561a348c04cce4"
-SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git;branch=master \
-           file://0001-Remove-variable-defined-in-header-file.patch \
-           "
+SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git"

 DEPENDS = "libnl"

@ -23,7 +21,7 @@ EXTRA_OEMAKE = "CFLAGS+="${CFLAGS} -I${STAGING_INCDIR}/libnl3/ -DCONFIG_LIBNL32
 		CC="${CC}" \
 		NLVER=3"

-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git/"

 # Install calibrator
 do_install() {
--- a/recipes-tools/battery-test/battery-test_git.bb
+++ b/recipes-tools/battery-test/battery-test_git.bb
@ -2,11 +2,11 @@ SUMMARY = "Battery Test tool"
 DESCRIPTION = "Read battery state, remaining time and other informations from battery"
 AUTHOR = "Ramon Mösching (ramon.moesching@netmodule.com)"
 SECTION = "core"
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 PR = "r0"

-RDEPENDS:${PN} = "python3-core python3-smbus"
+RDEPENDS_${PN} = "python3-core python3-smbus"

 SRC_URI =  "git://git.netmodule.intranet/nm-tools/smart-battery.git;protocol=ssh;user=gitea;branch=master "

@ -14,7 +14,7 @@ SRCREV ?= "7caae36f50ea23f69458fc50887c5ab59b4d48f3"

 S = "${WORKDIR}/git"

-FILES:${PN} = "${bindir}/* batterytest.py  "
+FILES_${PN} = "${bindir}/* batterytest.py  "


 do_install () {
--- a/recipes-tools/libnmapp/libnmapp_git.bb
+++ b/recipes-tools/libnmapp/libnmapp_git.bb
@ -1,27 +1,27 @@
 SUMMARY = "NetModule shared library"
 SECTION = "base"
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1f002990697cc3f88357d1c0790d47b2"

 SRC_URI = "git://gitlab.com/netmodule/tools/libnmapp.git;protocol=ssh;user=git;branch=develop"
-SRCREV ?= "09aafd5ac85cc277cd1d9bb5cd922520b9a3dddb"
+SRCREV ?= "dcf72e619b3a5085bba14db42e3a0d86cb4acdc8"

 PV = "0.0.1+git${SRCPV}"
 LIB_SHORT_NAME = "nmapp"
 LIB_PKG_NAME = "libnmapp.a"

-DEPENDS:append = " libevent systemd"
+DEPENDS_append = " libevent systemd"

 # Required to add the libary to the SDK.
 # ${PN}-dev depends on ${PN} which is empty because
 # only the static library is built
-ALLOW_EMPTY:${PN} = "1"
+ALLOW_EMPTY_${PN} = "1"

 S = "${WORKDIR}/git"
 B = "${S}/build"

 # build variables for the target (rest is default)
-EXTRA_OEMAKE:append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'USE_INITSYS_DUMMY=0' 'SYSROOT=${STAGING_DIR_TARGET}'"
+EXTRA_OEMAKE_append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'USE_INITSYS_DUMMY=0' 'SYSROOT=${STAGING_DIR_TARGET}'"

 do_install() {
    install -d ${D}${libdir}
--- a/recipes-tools/nmhw-auto-part/nmhw-auto-part_1.1.0.bb
+++ b/recipes-tools/nmhw-auto-part/nmhw-auto-part_1.1.0.bb
@ -1,11 +1,11 @@
 SUMMARY = "Adds a script and a systemd service to partition the drives of the system on the first boot."
 DESCRIPTION = "Adds a script and a systemd service to partition the drives of the system on the first boot."
 PR = "r1"
-LICENSE = "GPL-3.0-or-later"
+LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c"


-RDEPENDS:${PN} += "e2fsprogs-resize2fs \
+RDEPENDS_${PN} += "e2fsprogs-resize2fs \
                   e2fsprogs-mke2fs \
                   bash \
                   parted \
@ -23,6 +23,6 @@ do_install () {
  install -m 755 nmhw-auto-part ${D}${bindir}/
 }

-FILES:${PN} = " \
+FILES_${PN} = " \
                    ${bindir}/nmhw-auto-part \
                  "
--- a/recipes-tools/nmhw-fwupdate/nmhw-fwupdate.bb
+++ b/recipes-tools/nmhw-fwupdate/nmhw-fwupdate.bb
@ -3,10 +3,10 @@ DESCRIPTION = "Generic NetModule update tool for firmware, bootloaders, etc"
 AUTHOR = "Alexandre Bard"

 SECTION = "core"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"

-RDEPENDS:${PN} = " \
+RDEPENDS_${PN} = " \
              wget \
              bash \
              coreutils \
@ -14,13 +14,13 @@ RDEPENDS:${PN} = " \
                "

 SRC_URI =  " \
-    git://gitlab.com/netmodule/tools/nmhw-fwupdate.git;user=git;protocol=ssh;;branch=master \
+    git://gitlab.com/netmodule/tools/nmhw-fwupdate.git;user=git;protocol=ssh; \
    "
 SRCREV ?= "68b84ce457e8cd4a59e2f366114edf0098acbe4d"

 S = "${WORKDIR}/git/src"

-FILES:${PN} = " \
+FILES_${PN} = " \
    /lib \
    /usr \
    "
--- a/recipes-tools/ssf-mgr/ssf-mgr_git.bb
+++ b/recipes-tools/ssf-mgr/ssf-mgr_git.bb
@ -1,6 +1,6 @@
 SUMMARY = "NetModule system-state-framework manager"
 SECTION = "base"
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=6f1c528c9a0010ef398e26c661ff286e"

 SRC_URI = "git://gitlab.com/netmodule/tools/ssf-mgr.git;protocol=ssh;user=git;branch=develop"
@ -9,24 +9,24 @@ SRCREV ?= "eead025f7135b28cb6e3e1e68bd636e93b74798b"
 PV = "0.0.1+git${SRCPV}"


-DEPENDS:append = " libnmapp"
-RDEPENDS:${PN} = " packagegroup-system-state-framework"
+DEPENDS_append = " libnmapp"
+RDEPENDS_${PN} = " packagegroup-system-state-framework"

 inherit systemd

 S = "${WORKDIR}/git"
 B = "${S}/build"

-SYSTEMD_SERVICE:${PN} = "ssf-mgr.service"
+SYSTEMD_SERVICE_${PN} = "ssf-mgr.service"

-FILES:${PN} += " \
+FILES_${PN} += " \
                  ${bindir}/ssf-mgr \
                  ${systemd_system_unitdir}/ssf-mgr.service \
                  ${sysconfdir}/ssf-mgr/ssf-mgr.conf \
               "

 # build variables for the target (rest is default)
-EXTRA_OEMAKE:append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'"
+EXTRA_OEMAKE_append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'"

 do_install() {
    install -d ${D}${bindir}
--- a/recipes-tools/sys-mon/sys-mon_git.bb
+++ b/recipes-tools/sys-mon/sys-mon_git.bb
@ -9,23 +9,23 @@ SRCREV ?= "dbdbc1e31816239586b4706d962a16feb77bd1cf"
 PV = "0.0.1+git${SRCPV}"


-DEPENDS:append = " libnmapp"
+DEPENDS_append = " libnmapp"

 inherit systemd

 S = "${WORKDIR}/git"
 B = "${S}/build"

-SYSTEMD_SERVICE:${PN} = "sys-mon.service"
+SYSTEMD_SERVICE_${PN} = "sys-mon.service"

-FILES:${PN} += " \
+FILES_${PN} += " \
                  ${bindir}/sys-mon \
                  ${systemd_system_unitdir}/sys-mon.service \
                  ${sysconfdir}/sys-mon/sys-mon.conf \
               "

 # build variables for the target (rest is default)
-EXTRA_OEMAKE:append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'"
+EXTRA_OEMAKE_append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'"

 do_install() {
    install -d ${D}${bindir}
--- a/recipes-user-module/socket-uart/socket-uart_0.0.1.bb
+++ b/recipes-user-module/socket-uart/socket-uart_0.0.1.bb
@ -15,16 +15,16 @@ SRC_URI = " \

 S = "${WORKDIR}"

-RDEPENDS:${PN} = "socat um-service-cfg"
+RDEPENDS_${PN} = "socat um-service-cfg"


-SYSTEMD_SERVICE:${PN} = " \
+SYSTEMD_SERVICE_${PN} = " \
                              socket-uart.service \
                              socket-kline.service \
                              socket-lin.service \
                              "

-FILES:${PN} = "${systemd_unitdir}/system ${bindir} "
+FILES_${PN} = "${systemd_unitdir}/system ${bindir} "

 do_install() {
    install -d ${D}${systemd_unitdir}/system
--- a/recipes-user-module/um-service-cfg/files/um-service-config.sh
+++ b/recipes-user-module/um-service-cfg/files/um-service-config.sh
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash

 UM_CONFIG_PATH=/etc/user-module
 UM_CONFIG_FILE=network.conf
@ -37,16 +37,22 @@ done

 source $UM_CONFIG

-max_retry=30
+max_retry=15
 counter=0

 until [[ counter -ge $max_retry ]]
 do
  echo "Probing um. #$counter"
  ping -qc 1 -W 1 $USER_MODULE_ipv4_addr && break
+  sleep 1
  ((counter++))
 done

+if ! ping -qc 1 -W 1 $USER_MODULE_ipv4_addr
+then
+    echo "UM not reachable"
+    exit 1
+fi

 # Decide which config to load depending on the sw revision
 if `nc -z $USER_MODULE_ipv4_addr 7000` ; then
--- a/recipes-user-module/um-service-cfg/um-service-cfg_0.0.1.bb
+++ b/recipes-user-module/um-service-cfg/um-service-cfg_0.0.1.bb
@ -3,10 +3,10 @@
 inherit systemd
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-FILESEXTRAPATHS:prepend := "${THISDIR}/config:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/config:"

 ALTERNATIVE_PRIORITY[netcat] = "100"
-RDEPENDS:${PN} = "netcat"
+RDEPENDS_${PN} = "netcat"

 SRC_URI = " \
            file://um-service-config.service \
@ -18,9 +18,9 @@ SRC_URI = " \
            file://ports-v2 \
          "

-FILES:${PN} = "${systemd_unitdir}/system ${bindir} /etc/user-module"
+FILES_${PN} = "${systemd_unitdir}/system ${bindir} /etc/user-module"

-SYSTEMD_SERVICE:${PN} =" \
+SYSTEMD_SERVICE_${PN} =" \
                            um-service-config.service \
                            um-rgpio-config.service \
                            user-module.target \
Author	SHA1	Message	Date
Alexandre Bard	6f8a55775a	distro/netmodule-linux: Mark debian 12 as valid build host	2023-06-21 10:54:26 +02:00
Alexandre Bard	6be13a7db6	distro/netmodule-linux: Make build sstate compatible with all HOSTs	2023-06-21 10:53:38 +02:00
Alexandre Bard	694d02aea1	packagegroup-nm-net: Replace bare openvpn by NetworkManager integration NetworkManager can handle OpenVPN configurations directly, it is easier to use it directly than	2023-04-19 16:05:28 +02:00
Patrick Zysset	1be3029e38	Revert "pkggroup wwan: Add lpa to manage eUICC sim cards profiles" This reverts commit `da7c62fa14`. id:379399 Signed-off-by: Patrick Zysset <patrick.zysset@netmodule.com>	2023-03-24 17:42:14 +01:00
Alexandre Bard	f6e5b36d1e	sdk: Add libc static libraries Several libraries which are part of the libc package are required to statically link our firmware packages.	2023-03-10 15:34:58 +01:00
Alexandre Bard	504e367a0c	distro/netmodule-linux: Disable all libqmi configs Since libqmi is only used by ModemManager we don't need all the features. Default features (excluded with this commit) are udev and mbim. BugzID: 81947	2022-12-13 13:15:19 +01:00
Mr Jenkins	e2ecd080a0	meta-netmodule-distro: updated source revisions	2022-11-25 11:19:52 +01:00
Alexandre Bard	66216504ee	um-service-cfg: Small improvements Since kernel 5.10 upgrade, this script was actually not working properly. The script is waiting on network.target to be ready, but network.target does not mean that the route to user module is already setup. And since with kernel 5.10 the route needs a bridge to be setup, this takes a bit longer to be ready. When there is no route to an IP address, ping does not wait the specified timeout (-W) and returns immediately with an error. this was leading to the 30 pings being done over a much smaller time period than expected and therefore made the service fail before the route was setup. Also in case the user module was not found, the service did not fail but continued checking the port, which failed (of course) and the script was then wrongly assuming the presence of an old UM. BugzID: 81969	2022-11-14 14:36:18 +01:00
Alexandre Bard	c4f38ccd97	distro-netmodule: Move curl packageconfig to distro instead of bbappend Better keep all the packageconfig at one place and avoid an additional bbappend. Especially this config is apparently only required for factory, so we may move to fct distro. Original commit message: we need tftp client to upload factory test logs - enable package option 'tftp' in bbappend file. BUGZID: 52537	2022-09-26 17:53:41 +02:00
Alexandre Bard	f601e2d57d	Remove python3_bbappend This is not required anymore. The turtledemo were part of the python3-misc package which is not used anymore. BugzID: 81512	2022-09-26 17:47:35 +02:00
Alexandre Bard	7b7a373dbf	pyhon3: Remove extra pycache cleanup This extra step is not necessary. Specially since we don't remove the cached files anymore. BugzID: 80673	2022-09-21 14:45:24 +02:00
Alexandre Bard	535e4a4c8a	distro-minimal: Reinclude python cached files The difference in size of the final image is really minimal, but having this config different between minimal and "normal" distributions, makes us unable to share quite a lot of sstate between the two distributions. BugzID: 80673	2022-09-16 13:49:39 +02:00
Alexandre Bard	68f1d6876b	packagegroup-net: Add ethtool to base package It is required on fct image to read broadr metadata. BugzID: 77243	2022-09-12 11:17:42 +02:00
Alexandre Bard	8a75c1b88a	distro-netmodule: Enforce an empty packageconfig for lmsensors Since the bbappend in meta-netmodule-bsp is not needed anymore, this is easier to set this here. BugzID: 81093	2022-08-24 10:58:00 +02:00
Alexandre Bard	da7c62fa14	pkggroup wwan: Add lpa to manage eUICC sim cards profiles BugzID: 80707	2022-08-10 14:10:27 +02:00
Alexandre Bard	20b10c6179	ostree-initrd: Adapt patch after update of meta-updater This patch is removing the logs from the ostree initramdisk. It had to be adapted in regards to latest changes in meta-updater. BugzID: 80886	2022-08-10 14:09:41 +02:00
				`@ -0,0 +1 @@`
				`SRCREV = "42e96b13dda2afabbcec2622612d13495a415caa"`