Merge branch 'develop' into kirkstone

imx8 machine.conf: Fix include or architecture file
The path has changed with kirkstone. Part of yocto upgrade from dunfell to kirkstone
2022-08-18 13:31:58 +02:00 · 2022-08-02 15:43:05 +02:00 · 2022-08-02 15:43:05 +02:00 · 2022-08-02 15:42:41 +02:00 · 2022-08-02 15:42:41 +02:00 · 2022-08-02 15:42:41 +02:00
57 changed files with 448 additions and 483 deletions
--- a/bbappends/ublox-module/recipes-connectivity/jody-w1-bt-hcd/jody-w1-bt-hcd.bbappend
+++ b/bbappends/ublox-module/recipes-connectivity/jody-w1-bt-hcd/jody-w1-bt-hcd.bbappend
@ -3,24 +3,24 @@

 inherit systemd

-RDEPENDS_${PN} += "libgpiod-tools"
+RDEPENDS:${PN} += "libgpiod-tools"

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

-SRC_URI_append = " \ 
+SRC_URI:append = " \ 
           file://jody-w1-bt-init.service \
           file://jody-w1-bt \
           "

 S = "${WORKDIR}"

-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
                          jody-w1-bt-init.service \
                        "

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

-do_install_append() {
+do_install:append() {
    install -d ${D}${systemd_unitdir}/system
    install -m 644 ${WORKDIR}/jody-w1-bt-init.service ${D}${systemd_unitdir}/system/

--- a/bbappends/ublox-module/recipes-kernel/jody-w1-driver-pcie/jody-w1-driver-pcie_%.bbappend
+++ b/bbappends/ublox-module/recipes-kernel/jody-w1-driver-pcie/jody-w1-driver-pcie_%.bbappend
@ -1,11 +1,11 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"

-RDEPENDS_${PN}_remove = " ${PN}-wpa-supplicant ${PN}-hostapd"
+RDEPENDS:${PN}:remove = " ${PN}-wpa-supplicant ${PN}-hostapd"

-SRC_URI_append = "file://0001-Disable-wowlan_config.patch"
+SRC_URI:append = "file://0001-Disable-wowlan_config.patch"

 # unblacklist pcie driver and fw files (default)
-do_configure_prepend () {
+do_configure:prepend () {
    for i in $(seq 1 4); do
        sed -e "${i}s/^#*/#/" -i ${WORKDIR}/jody-w1-driver-pcie.conf
    done
--- a/classes/kernel-fitimage-fpga.bbclass
+++ b/classes/kernel-fitimage-fpga.bbclass
@ -6,17 +6,17 @@ do_assemble_fitimage[depends] += "fpga-image:do_deploy"
 # $1 ... .its filename
 # $2 ... Image counter
 # $3 ... Path to fpga image
-fitimage_emit_section_kernel_append() {
+fitimage_emit_section_kernel:append() {
        fpgacount=1
        cat << EOF >> ${1}
-                fpga@${fpgacount} {
+                fpga-${fpgacount} {
                        description = "FPGA";
                        data = /incbin/("${DEPLOY_DIR_IMAGE}/fpga-image-${MACHINE}");
                        type = "fpga";
                        arch = "${UBOOT_ARCH}";
                        compression = "none";
-                        hash@1 {
-                                algo = "sha1";
+                        hashi-1 {
+                                algo = "sha256";
                        };
                };
 EOF
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -19,5 +19,5 @@ LAYERVERSION_netmodule-bsp = "1"

 LAYERDEPENDS_netmodule-bsp = "core"

-LAYERSERIES_COMPAT_netmodule-bsp = "dunfell"
+LAYERSERIES_COMPAT_netmodule-bsp = "dunfell kirkstone"

--- a/conf/machine/am335x-hw25.conf
+++ b/conf/machine/am335x-hw25.conf
@ -12,7 +12,7 @@ KERNEL_DEVICETREE_TO_USE = "${HW25_DT}"
 SERIAL_CONSOLES = "115200;ttyS0"
 DEFAULT_ETH = "lan0"

-MACHINE_FEATURES_remove = " \
+MACHINE_FEATURES:remove = " \
    bluetooth \
    tibluetooth \
    "
--- a/conf/machine/am335x-hw26.conf
+++ b/conf/machine/am335x-hw26.conf
@ -7,4 +7,4 @@ require am335x-nmhw21.conf
 KERNEL_DEVICETREE_TO_USE = "${HW26_DT}"
 MACHINEOVERRIDES .= ":am335x-nmhw21"
 MACHINE_FEATURES += "pps"
-MACHINE_FEATURES_remove = "user-module"
+MACHINE_FEATURES:remove = "user-module"
--- a/conf/machine/armada-385-nbhw14.conf
+++ b/conf/machine/armada-385-nbhw14.conf
@ -14,7 +14,7 @@ KERNEL_DEVICETREE = "armada-385-nbhw14-prod1.dtb \
 KERNEL_IMAGETYPE = "zImage"

 PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
-PV_pn-linux-netmodule = "4.12.0-${SRCPV}"
-SRC_URI_pn-linux-netmodule = "git://github.com/netmodule/linux.git;protocol=https;branch=4.12/standard/nrhw14"
-SRCREV_pn-linux-netmodule = "2fb3360ec3cf672c74321e1dbe5c04e59d1ced11"
+PV:pn-linux-netmodule = "4.12.0-${SRCPV}"
+SRC_URI:pn-linux-netmodule = "git://github.com/netmodule/linux.git;protocol=https;branch=4.12/standard/nrhw14"
+SRCREV:pn-linux-netmodule = "2fb3360ec3cf672c74321e1dbe5c04e59d1ced11"

--- a/conf/machine/armada-385-nrhw18.conf
+++ b/conf/machine/armada-385-nrhw18.conf
@ -13,7 +13,7 @@ KERNEL_MODULE_PROBECONF += "ath10k_pci"
 module_conf_ath10k_pci = "options ath10k_pci irq_mode=1"

 UBOOT_MACHINE = "armada-385-hw18_defconfig"
-IMAGE_BOOT_FILES = "u-boot-armada-385-hw18.kwb"
+IMAGE_BOOT_FILES = "u-boot-armada-385-nrhw18.kwb"

 DEFAULT_ETH = "eth2"

--- a/conf/machine/imx8-mek.conf
+++ b/conf/machine/imx8-mek.conf
@ -14,7 +14,7 @@ KERNEL_DEVICETREE = "freescale/fsl-imx8qxp-mek.dtb freescale/fsl-imx8qxp-mek-dom

 SOTA_MACHINE = "${MACHINE}"

-KERNEL_CLASSES_append = " kernel-fitimage"
+KERNEL_CLASSES:append = " kernel-fitimage"

 KERNEL_IMAGETYPE = "Image"
 UBOOT_ENTRYPOINT ?= "0x80020000"
--- a/conf/machine/imx8-nmhw23-dlm.conf
+++ b/conf/machine/imx8-nmhw23-dlm.conf
@ -7,4 +7,4 @@ KERNEL_DEVICETREE_TO_USE = "${HW23_DLM_DT}"
 MACHINEOVERRIDES .= ":imx8-nmhw23"
 SOTA_MACHINE = "imx8-nmhw23"

-MACHINE_FEATURES_remove = "v2x"
+MACHINE_FEATURES:remove = "v2x"
--- a/conf/machine/imx8-nmhw23.conf
+++ b/conf/machine/imx8-nmhw23.conf
@ -12,7 +12,7 @@ KERNEL_DEVICETREE_TO_USE = "${HW23_DT}"

 SOTA_MACHINE = "${MACHINE}"

-KERNEL_CLASSES_append = " kernel-fitimage"
+KERNEL_CLASSES:append = " kernel-fitimage"

 #UBOOT_MACHINE = "imx8_nmhw23_defconfig"
 IMAGE_BOOT_FILES = "flash.bin"
--- a/conf/machine/include/armada.inc
+++ b/conf/machine/include/armada.inc
@ -3,14 +3,14 @@ require conf/machine/include/soc-family.inc
 require netmodule-hardware.inc

 DEFAULTTUNE ?= "cortexa9thf-neon"
-require conf/machine/include/tune-cortexa9.inc
+require conf/machine/include/arm/armv7a/tune-cortexa9.inc

 # Default providers, may need to override for specific machines
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada"
 PREFERRED_PROVIDER_u-boot = "u-boot-armada"

 UBOOT_ARCH = "arm"
-UBOOT_MACHINE = "mvebu_db_armada8k_config"
+UBOOT_MACHINE = "mvebu_db:armada8k_config"

 UBOOT_ENTRYPOINT = "0x13000000"
 UBOOT_LOADADDRESS = "0x13000000"
--- a/conf/machine/include/imx8.inc
+++ b/conf/machine/include/imx8.inc
@ -7,7 +7,7 @@ IMX_DEFAULT_BSP = ""
 # Prevent usage of dynamic-packagearch for the kernel
 MACHINE_ARCH_FILTER = ""

-require conf/machine/include/tune-cortexa35.inc
+require conf/machine/include/arm/armv8a/tune-cortexa35.inc

 MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:"

--- a/conf/machine/include/ti33x.inc
+++ b/conf/machine/include/ti33x.inc
@ -3,7 +3,7 @@ require conf/machine/include/soc-family.inc
 require netmodule-hardware.inc

 DEFAULTTUNE ?= "cortexa8thf-neon"
-require conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/arm/armv7a/tune-cortexa8.inc

 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"

--- a/freescale/recipes-imx/imx-atf/imx-atf_1.5.0.bb
+++ b/freescale/recipes-imx/imx-atf/imx-atf_1.5.0.bb
@ -3,7 +3,7 @@
 DESCRIPTION = "i.MX ARM Trusted Firmware"
 SECTION = "BSP"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"

 PV = "1.5.0+git${SRCPV}"

--- a/freescale/recipes-imx/imx-mkimage/imx-boot_0.2.bb
+++ b/freescale/recipes-imx/imx-mkimage/imx-boot_0.2.bb
@ -3,8 +3,8 @@
 require imx-mkimage_git.inc

 DESCRIPTION = "Generate Boot Loader for i.MX 8 device"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 SECTION = "BSP"

 IMX_EXTRA_FIRMWARE      = "firmware-imx-8 imx-sc-firmware"
@ -16,7 +16,7 @@ DEPENDS += " \
    ${IMX_EXTRA_FIRMWARE} \
    imx-atf \
 "
-DEPENDS_append_mx8m = " dtc-native"
+DEPENDS:append_mx8m = " dtc-native"
 BOOT_NAME = "imx-boot"
 PROVIDES = "${BOOT_NAME}"

@ -39,7 +39,7 @@ ATF_MACHINE_NAME_mx8qm = "bl31-imx8qm.bin"
 ATF_MACHINE_NAME_mx8qxp = "bl31-imx8qxp.bin"
 ATF_MACHINE_NAME_mx8mq = "bl31-imx8mq.bin"
 ATF_MACHINE_NAME_mx8mm = "bl31-imx8mm.bin"
-ATF_MACHINE_NAME_append = "${@bb.utils.contains('COMBINED_FEATURES', 'optee', '-optee', '', d)}"
+ATF_MACHINE_NAME:append = "${@bb.utils.contains('COMBINED_FEATURES', 'optee', '-optee', '', d)}"

 DCD_NAME ?= "imx8qm_dcd.cfg.tmp"
 DCD_NAME_mx8qm = "imx8qm_dcd.cfg.tmp"
@ -174,6 +174,6 @@ do_deploy() {
 addtask deploy before do_build after do_compile

 PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILES_${PN} = "/boot"
+FILES:${PN} = "/boot"

 COMPATIBLE_MACHINE = "(mx8)"
--- a/freescale/recipes-imx/imx-mkimage/imx-mkimage_git.bb
+++ b/freescale/recipes-imx/imx-mkimage/imx-mkimage_git.bb
@ -4,8 +4,8 @@
 require imx-mkimage_git.inc

 DESCRIPTION = "i.MX make image"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 SECTION = "BSP"

 inherit native deploy
--- a/freescale/recipes-imx/imx-sc-firmware/imx-sc-firmware_1.5.0.bb
+++ b/freescale/recipes-imx/imx-sc-firmware/imx-sc-firmware_1.5.0.bb
@ -6,7 +6,7 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
 SECTION = "BSP"

-FILESEXTRAPATHS_prepend := "${THISDIR}/files/${MACHINE}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/${MACHINE}:"

 inherit fsl-eula-unpack deploy

@ -20,7 +20,7 @@ symlink_name = "scfw_tcm.bin"
 SRC_URI += "file://scfw_tcm_cfw.bin"
 SC_FIRMWARE_NAME = "scfw_tcm_cfw.bin"

-do_configure_prepend() {
+do_configure:prepend() {
    cp ${WORKDIR}/scfw_tcm_cfw.bin ${B}
 }

--- a/freescale/recipes-imx/imx-uuc/imx-uuc_git.bb
+++ b/freescale/recipes-imx/imx-uuc/imx-uuc_git.bb
@ -3,18 +3,18 @@
 SUMMARY = "A Daemon wait for Freescale/NXP mfgtools host's command"
 SECTION = "base"
 DEPENDS = "dosfstools-native"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"

 inherit autotools-brokensep

 PV = "0.5.1+git${SRCPV}"

-SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https"
+SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https;branch=master"
 SRCREV = "e3fbdfef978abd150d9ea71c4d174daded9c8d33"

 S = "${WORKDIR}/git"

-FILES_${PN} += "/linuxrc /fat"
+FILES:${PN} += "/linuxrc /fat"

 COMPATIBLE_MACHINE = "(imx)"
--- a/recipes-bsp/bootloader-config/bootloader-config.bb
+++ b/recipes-bsp/bootloader-config/bootloader-config.bb
@ -1,8 +1,8 @@
 DESCRIPTION = "Bootloader configuration tool"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"

-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
    python3-setuptools \
    "
 DEPENDS = "python3-setuptools-git-version-native"
@ -20,14 +20,14 @@ S = "${WORKDIR}/git"
 # Likely required in the future
 #PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit allarch
-#do_configure_prepend() {
+#do_configure:prepend() {
 #    cp ${S}/platforms/${MACHINE}/* ${S}/bootloader_config
 #}

-SYSTEMD_SERVICE_${PN} = "bootloader-config.service"
+SYSTEMD_SERVICE:${PN} = "bootloader-config.service"

 # do_install is done by setuptools
-do_install_append() {
+do_install:append() {
    install -d ${D}/${systemd_unitdir}/system/
    install -m 0644 ${S}/systemd/bootloader-config.service ${D}/${systemd_unitdir}/system/
 }
--- a/recipes-bsp/fpga-image/fpga-image.bb
+++ b/recipes-bsp/fpga-image/fpga-image.bb
@ -1,6 +1,6 @@
 DESCRIPTION = "Fpga images"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"

 inherit deploy

@ -21,6 +21,6 @@ do_deploy () {
    cp ${WORKDIR}/LG00000000 ${DEPLOYDIR}/fpga-image-${MACHINE}
 }

-FILES_${PN} += "/logic/LG00000000" 
+FILES:${PN} += "/logic/LG00000000" 

 addtask deploy before do_build after do_compile
--- a/recipes-bsp/mac-address-set/mac-address-set.bb
+++ b/recipes-bsp/mac-address-set/mac-address-set.bb
@ -2,8 +2,8 @@ SUMMARY = "Set mac addresses of Wifi and bluetooth chips"
 DESCRIPTION = "Small scripts that set the mac addresses based on ethernet mac"
 AUTHOR = "Alexandre Bard"

-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 PR = "r2"

 inherit systemd
@ -18,10 +18,10 @@ S = "${WORKDIR}"

 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"

-SYSTEMD_SERVICE_${PN} = "wlan-address-set.service bt-address-set.service"
+SYSTEMD_SERVICE:${PN} = "wlan-address-set.service bt-address-set.service"
 SYSTEMD_AUTO_ENABLE ?= "enable"

-FILES_${PN}_append = " \
+FILES:${PN}:append = " \
                    /lib \
                    /usr \
                    "
--- a/recipes-bsp/storage-info/storage-info.bb
+++ b/recipes-bsp/storage-info/storage-info.bb
@ -9,23 +9,23 @@ SRCREV ?= "6584feb5fb3e18572fee1cea9e20a6b8e5cd0251"
 PV = "0.0.1+git${SRCPV}"


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

 inherit systemd

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

-SYSTEMD_SERVICE_${PN} = "storage-info.service"
+SYSTEMD_SERVICE:${PN} = "storage-info.service"

-FILES_${PN} += " \
+FILES:${PN} += " \
                  ${bindir}/storage-info \
                  ${systemd_system_unitdir}/storage-info.service \
                  ${sysconfdir}/storage/storage-info.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-bsp/u-boot/u-boot-armada/0001-remove-redundant-YYLOC-declaration.patch
+++ b/recipes-bsp/u-boot/u-boot-armada/0001-remove-redundant-YYLOC-declaration.patch
@ -0,0 +1,44 @@
+From 52c3ac31426131c555093542d51f1e6e0623507c Mon Sep 17 00:00:00 2001
+From: Marc Mattmueller <marc.mattmueller@netmodule.com>
+Date: Mon, 18 Jul 2022 19:26:59 +0200
+Subject: [PATCH] u-boot-armada: Remove redundant YYLOC global declaration
+
+Same as the upstream fix for building dtc with gcc 10.
+
+After having consulted the team, this patch is only applied to
+the armada bootloader as this one is used on the core os
+environment build-up.
+
+Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>
+---
+ scripts/dtc/dtc-lexer.l             | 1 -
+ scripts/dtc/dtc-lexer.lex.c_shipped | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
+index fd825ebba6..24af549977 100644
+--- a/scripts/dtc/dtc-lexer.l
+++ b/scripts/dtc/dtc-lexer.l
+@@ -38,7 +38,6 @@ LINECOMMENT	"//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped
+index 3934d8624d..22f6e0d1f8 100644
+--- a/scripts/dtc/dtc-lexer.lex.c_shipped
+++ b/scripts/dtc/dtc-lexer.lex.c_shipped
+@@ -639,7 +639,6 @@ char *yytext;
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+-- 
+2.20.1
+
--- a/recipes-bsp/u-boot/u-boot-armada_git.bb
+++ b/recipes-bsp/u-boot/u-boot-armada_git.bb
@ -1,14 +1,17 @@
 require u-boot-nm.inc

 # Be aware github/netmodule git
-SRC_URI = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;protocol=ssh;user=git;branch=2017.11/standard/armada-385"
+SRC_URI = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;protocol=ssh;user=git;branch=2017.11/standard/armada-385 \
+           file://0001-remove-redundant-YYLOC-declaration.patch;name=yylloc \
+"
+SRC_URI[yylloc.md5sum] = "504cb5b73a174a32e55c58f60608925d"

 DEPENDS += "bc-native"

 # Should be updated when a new U-Boot Version is available
-#SRCREV ?= "68d28424cf41e141207d9d8af76c5bc5e01a55e2"
 SRCREV ?= "68d28424cf41e141207d9d8af76c5bc5e01a55e2"

+
 UBOOT_SUFFIX = "kwb"
 UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"

--- a/recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb
+++ b/recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb
@ -7,7 +7,7 @@ require recipes-bsp/u-boot/u-boot.inc

 PROVIDES += "u-boot"

-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"

 SRC_URI = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;protocol=ssh;user=git;branch=2018.03/imx/imx8-nmhw23;destsuffix=git"
@ -23,14 +23,14 @@ LOCALVERSION ?= "-${SRCBRANCH}"
 BOOT_TOOLS = "imx-boot-tools"
 UBOOT_INITIAL_ENV = ""

-do_configure_prepend() {
+do_configure:prepend() {
    if [ ! -d ${S}/board/netmodule/common ]; then
        mkdir -p ${S}/board/netmodule/
        ln -s ${S}/board/freescale/common ${S}/board/netmodule/common
    fi
 }

-do_deploy_append_mx8m() {
+do_deploy:append_mx8m() {
    # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
    if [ -n "${UBOOT_CONFIG}" ]
    then
--- a/recipes-bsp/u-boot/u-boot-nm.inc
+++ b/recipes-bsp/u-boot/u-boot-nm.inc
@ -1,6 +1,6 @@
 require recipes-bsp/u-boot/u-boot.inc

-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"

 S = "${WORKDIR}/git"
--- a/recipes-bsp/usb-hub-reset/usb-hub-reset.bb
+++ b/recipes-bsp/usb-hub-reset/usb-hub-reset.bb
@ -2,7 +2,7 @@ DESCRIPTION = "USB-Hub Reset on HW23"
 HOMEPAGE = "www.netmodule.com"
 LICENSE = "MIT"
 SECTION = "bsp"
-RDEPENDS_${PN} = "usbutils coreutils"
+RDEPENDS:${PN} = "usbutils coreutils"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

 inherit systemd
@ -14,11 +14,11 @@ SRC_URI = " \

 S = "${WORKDIR}"

-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
                          usb-hub-reset.service \
                        "

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

 do_install() {
    install -d ${D}${systemd_unitdir}/system
--- a/recipes-bsp/v2x-ieee802.11p/v2x-ieee802.11p.bb
+++ b/recipes-bsp/v2x-ieee802.11p/v2x-ieee802.11p.bb
@ -5,7 +5,7 @@ DESCRIPTION = "Murata v2x module firmware loader service"
 HOMEPAGE = "www.netmodule.com"
 LICENSE = "MIT"
 SECTION = "bsp/firmware"
-RDEPENDS_${PN} = "dfu-util usbutils coreutils"
+RDEPENDS:${PN} = "dfu-util usbutils coreutils"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

 inherit systemd
@ -20,11 +20,11 @@ SRC_URI = " \

 S = "${WORKDIR}"

-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
                          v2x-ieee802.11p.service \
                        "

-FILES_${PN} = "${systemd_unitdir}/system ${bindir} ${nonarch_base_libdir}/firmware/v2x ${sysconfdir} "
+FILES:${PN} = "${systemd_unitdir}/system ${bindir} ${nonarch_base_libdir}/firmware/v2x ${sysconfdir} "

 do_install() {
    install -d ${D}${systemd_unitdir}/system
--- a/recipes-connectivity/cannelloni/cannelloni.bb
+++ b/recipes-connectivity/cannelloni/cannelloni.bb
@ -1,29 +0,0 @@
-SUMMARY = "SocketCAN over Ethernet tunnel using UDP to transfer CAN frames between two machines"
-SECTION = "socketcan"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r0"
-
-RDEPENDS_${PN}-dev += "${PN}-staticdev"
-
-SRCREV = "e3ac7393b566345d057c2d17a4d328007caaacac"
-
-SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=http"
-
-S = "${WORKDIR}/git"
-
-inherit pkgconfig cmake
-inherit systemd
-
-EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=Release"
-
-INSANE_SKIP_${PN} = "ldflags"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-SOLIBS = ".so"
-FILES_SOLIBSDEV = ""
-
-do_install_append () {
-	install -d ${D}${libdir}
-	install -m 0755 ${WORKDIR}/build/libcannelloni-common.so ${D}${libdir}
-}
--- a/recipes-connectivity/gnss-init/gnss-init.bb
+++ b/recipes-connectivity/gnss-init/gnss-init.bb
@ -9,21 +9,21 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda

 inherit systemd

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

-SRC_URI_append = " \ 
+SRC_URI:append = " \ 
           file://gnss-init.service \
           "

 S = "${WORKDIR}"

-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
                          gnss-init.service \
                        "

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

-do_install_append() {
+do_install:append() {
    install -d ${D}${systemd_unitdir}/system
    install -m 644 ${WORKDIR}/gnss-init.service ${D}${systemd_unitdir}/system/
 }
--- a/recipes-connectivity/gnss-mgr/gnss-mgr.bb
+++ b/recipes-connectivity/gnss-mgr/gnss-mgr.bb
@ -1,8 +1,8 @@
 DESCRIPTION = "NetModule GNSS management tool"
-LICENSE = "LGPLv3"
+LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404"

-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
    python3-setuptools \
    nmubxlib \
    python3-systemd \
@ -14,7 +14,7 @@ inherit setuptools3
 inherit gitpkgv

 inherit systemd
-SYSTEMD_SERVICE_${PN} = "gnss-mgr.service"
+SYSTEMD_SERVICE:${PN} = "gnss-mgr.service"

 inherit allarch

@ -29,10 +29,10 @@ SRCREV ?= "e7970e6486473c78c2c6f1f63c5a15fc28606c2d"
 S = "${WORKDIR}/git"

 PACKAGES =+ "${PN}-test"
-SUMMARY_${PN}-test = "Addon to gnss-mgr for testing purposes"
-FILES_${PN}-test = "${bindir}/gnss-config-reader"
+SUMMARY:${PN}-test = "Addon to gnss-mgr for testing purposes"
+FILES:${PN}-test = "${bindir}/gnss-config-reader"

-do_install_append() {
+do_install:append() {
    install -d ${D}${sysconfdir}/gnss
    install -m 0644 ${S}/config/gnss-neom8.conf ${D}${sysconfdir}/gnss/gnss0.conf

--- a/recipes-connectivity/hostapd/hostapd_2.10.bbappend
+++ b/recipes-connectivity/hostapd/hostapd_2.10.bbappend
@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

 DEPENDS = "libnl dbus"
 
@ -7,6 +7,6 @@ export EXTRA_CFLAGS = " \
    -I${STAGING_DIR_TARGET}/usr/include/libnl3 \
 "

-do_configure_prepend () {
+do_configure:prepend () {
    sed -i 's/CONFIG_LIBNL_TINY=y/#CONFIG_LIBNL_TINY=y/g' ${WORKDIR}/hostapd-full.config
 }
--- a/recipes-connectivity/hostapd/wpa-supplicant_2.10.bbappend
+++ b/recipes-connectivity/hostapd/wpa-supplicant_2.10.bbappend
@ -5,12 +5,12 @@ export EXTRA_CFLAGS = " \
    -I${STAGING_DIR_TARGET}/usr/include/libnl3 \
 "

-SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service"
+SYSTEMD_SERVICE:${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service"
 SYSTEMD_AUTO_ENABLE = "disable"

-FILES_${PN} += "/usr/lib/systemd/system/*"
+FILES:${PN} += "/usr/lib/systemd/system/*"

-do_configure_prepend () {
+do_configure:prepend () {
    sed -i 's/#CONFIG_CTRL_IFACE_DBUS_NEW=y/CONFIG_CTRL_IFACE_DBUS_NEW=y/g' ${WORKDIR}/wpa_supplicant-full.config
    sed -i 's/#CONFIG_CTRL_IFACE_DBUS_INTRO=y/CONFIG_CTRL_IFACE_DBUS_INTRO=y/g' ${WORKDIR}/wpa_supplicant-full.config

@ -18,7 +18,7 @@ do_configure_prepend () {
 }


-do_install_append () {
+do_install:append () {

 	install -d ${D}/${sysconfdir}/dbus-1/system.d
 	install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
--- a/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch
+++ b/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch
@ -0,0 +1 @@
+../../../../meta-openembedded/meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch
--- a/recipes-connectivity/modemmanager/modemmanager_1.14.8.bb
+++ b/recipes-connectivity/modemmanager/modemmanager_1.14.8.bb
@ -1,57 +0,0 @@
-# NB: backport from meta-oe/master
-
-SUMMARY = "ModemManager is a daemon controlling broadband devices/connections"
-DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections"
-HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/"
-LICENSE = "GPL-2.0 & LGPL-2.1"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
-"
-
-inherit gnomebase gettext systemd vala gobject-introspection bash-completion
-
-DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native"
-
-SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-SRC_URI[sha256sum] = "fe1a26ba51b4bda7abd09ad4dadedd87d8b8154809fc9d88e94f75fdfff19295"
-S = "${WORKDIR}/ModemManager-${PV}"
-
-PACKAGECONFIG = "systemd"
-PACKAGECONFIG ??= "mbim qmi \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \
-"
-
-PACKAGECONFIG[at] = "--with-at-command-via-dbus"
-PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,"
-PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit"
-# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol.
-PACKAGECONFIG[mbim] = "--with-mbim,--without-mbim,libmbim"
-# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol.
-PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi"
-
-EXTRA_OECONF = " \
-    --with-udev-base-dir=${nonarch_base_libdir}/udev \
-"
-
-FILES_${PN} += " \
-    ${datadir}/icons \
-    ${datadir}/polkit-1 \
-    ${datadir}/dbus-1 \
-    ${datadir}/ModemManager \
-    ${libdir}/ModemManager \
-    ${systemd_unitdir}/system \
-"
-
-FILES_${PN}-dev += " \
-    ${libdir}/ModemManager/*.la \
-"
-
-FILES_${PN}-staticdev += " \
-    ${libdir}/ModemManager/*.a \
-"
-
-FILES_${PN}-dbg += "${libdir}/ModemManager/.debug"
-
-SYSTEMD_SERVICE_${PN} = "ModemManager.service"
-
--- a/recipes-connectivity/modemmanager/modemmanager_git.bb
+++ b/recipes-connectivity/modemmanager/modemmanager_git.bb
@ -1,8 +1,12 @@
-require recipes-connectivity/modemmanager/modemmanager_1.14.8.bb
+require recipes-connectivity/modemmanager/modemmanager_1.18.8.bb

 # Use custom git repo as SRC
-SRC_URI = "git://gitlab.com/netmodule/third-party/ModemManager;protocol=ssh;user=git;branch=mm-1-14-netmodule;"
-SRCREV ?= "35ef2f387bf53f0601901a5f08ab0f6bf57105c4"
+SRC_URI = " \
+    git://gitlab.com/netmodule/third-party/ModemManager;protocol=ssh;user=git;branch=mm-1-18-netmodule \
+    file://0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch \
+"
+
+SRCREV = "a092259df33cc70a04826f0e7117475ac9b26f99"
 S = "${WORKDIR}/git"

 # Keep only ublox plugin
@ -12,10 +16,10 @@ EXTRA_OECONF += "--disable-all-plugins --enable-plugin-ublox"
 PACKAGECONFIG = "systemd"

 # Add whitelist rules
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI += "file://77-mm-netmodule-whitelist.rules"

-do_install_append() {
+do_install:append() {
    install -m 0644 ${WORKDIR}/77-mm-netmodule-whitelist.rules ${D}${libdir}/udev/rules.d/
    sed -i -e 's/bin\/ModemManager/bin\/ModemManager --filter-policy=WHITELIST-ONLY/g' ${D}${systemd_unitdir}/system/ModemManager.service
 }
--- a/recipes-connectivity/networkmanager/networkmanager-conf.bb
+++ b/recipes-connectivity/networkmanager/networkmanager-conf.bb
@ -3,9 +3,9 @@ inherit allarch
 DESCRIPTION = "Configuration files for NetworkManager"

 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"

-RDEPENDS_${PN} = "networkmanager"
+RDEPENDS:${PN} = "networkmanager"
 PACKAGECONFIG ?= ""

 DEFAULT_ETH ??= "eth0"
@ -20,7 +20,7 @@ SRC_URI = " \
                 file://unmanaged-devices.conf \
 "

-SRC_URI_append_am335x-nrhw20 = " \
+SRC_URI:append_am335x-nrhw20 = " \
                file://system-connections-static.tar.gz \
                file://system-connections-dhcp.tar.gz \
 "
@ -51,7 +51,7 @@ do_install () {
    fi
 }

-do_install_append_am335x-nrhw20() {
+do_install:append_am335x-nrhw20() {
    rm -rf ${D}${sysconfdir}/NetworkManager/system-connections/*
    if ${@bb.utils.contains('PACKAGECONFIG','ethernet-dhcp','true','false',d)}; then
        install -m 0600 ${WORKDIR}/system-connections-dhcp/* ${D}${sysconfdir}/NetworkManager/system-connections/
@ -61,10 +61,10 @@ do_install_append_am335x-nrhw20() {
 }


-FILES_${PN} = " \
+FILES:${PN} = " \
    ${sysconfdir}/NetworkManager/NetworkManager.conf \
    ${sysconfdir}/NetworkManager/dnsmasq.d \
-	${sysconfdir}/NetworkManager/system-connections \
+    ${sysconfdir}/NetworkManager/system-connections \
    ${sysconfdir}/NetworkManager/conf.d \
 "

--- a/recipes-connectivity/networkmanager/networkmanager/0001-Reactivate-GSM-connections-when-ModemManager-reconne.patch
+++ b/recipes-connectivity/networkmanager/networkmanager/0001-Reactivate-GSM-connections-when-ModemManager-reconne.patch
@ -1,6 +1,6 @@
-From f7c129b1775e35f603c1c58c12f958ae81ae6bb8 Mon Sep 17 00:00:00 2001
+From 8558b348c92e276b586cfd502992c07679970085 Mon Sep 17 00:00:00 2001
 From: Alexandre Bard <alexandre.bard@netmodule.com>
-Date: Wed, 13 Nov 2019 17:53:54 +0100
+Date: Mon, 18 Jul 2022 17:06:03 +0200
 Subject: [PATCH] Reactivate GSM connections when ModemManager reconnects by
 itself

@ -9,51 +9,51 @@ itself if the modem requests it. This commit makes sure that a
 reconnection of the modem makes the GSM connection active in NM.

 BugzID: 60029
+Signed-off-by: Alexandre Bard <alexandre.bard@netmodule.com>
 ---
- src/devices/wwan/nm-device-modem.c | 8 +++++---
- src/nm-policy.c                    | 5 +++++
- 2 files changed, 10 insertions(+), 3 deletions(-)
+ src/core/devices/wwan/nm-device-modem.c | 7 ++++---
+ src/core/nm-policy.c                    | 5 +++++
+ 2 files changed, 9 insertions(+), 3 deletions(-)

-diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
-index 1e3162808..f03818599 100644
--- a/src/devices/wwan/nm-device-modem.c
-+++ b/src/devices/wwan/nm-device-modem.c
-@@ -360,9 +360,11 @@ modem_state_cb (NMModem *modem,
- 		nm_device_recheck_available_connections (device);
- 	}
+diff --git a/src/core/devices/wwan/nm-device-modem.c b/src/core/devices/wwan/nm-device-modem.c
+index ef802a44f2..9914f2b33a 100644
+--- a/src/core/devices/wwan/nm-device-modem.c
+++ b/src/core/devices/wwan/nm-device-modem.c
+@@ -308,9 +308,10 @@ modem_state_cb(NMModem *modem, int new_state_i, int old_state_i, gpointer user_d
+         nm_device_recheck_available_connections(device);
+     }
 
-	nm_device_queue_recheck_available (device,
-	                                   NM_DEVICE_STATE_REASON_MODEM_AVAILABLE,
-	                                   NM_DEVICE_STATE_REASON_MODEM_FAILED);
-+	nm_device_recheck_available_connections (device);
-+
-+	if (new_state == NM_MODEM_STATE_CONNECTED)
-+		nm_device_emit_recheck_auto_activate(device);
+-    nm_device_queue_recheck_available(device,
+-                                      NM_DEVICE_STATE_REASON_MODEM_AVAILABLE,
+-                                      NM_DEVICE_STATE_REASON_MODEM_FAILED);
+    nm_device_recheck_available_connections(device);
 +
+    if (new_state == NM_MODEM_STATE_CONNECTED)
+        nm_device_emit_recheck_auto_activate(device);
 }
 
 static void
-diff --git a/src/nm-policy.c b/src/nm-policy.c
-index 1faba5c7b..02088bb6e 100644
--- a/src/nm-policy.c
-+++ b/src/nm-policy.c
-@@ -1019,6 +1019,9 @@ update_ip4_routing (NMPolicy *self, gboolean force_update)
- 	       nm_connection_get_id (nm_active_connection_get_applied_connection (best_ac)),
- 	       ip_iface);
- 	_notify (self, PROP_DEFAULT_IP4_AC);
+diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c
+index d77fc0a025..71dff18548 100644
+--- a/src/core/nm-policy.c
+++ b/src/core/nm-policy.c
+@@ -1075,6 +1075,9 @@ update_ip4_routing(NMPolicy *self, gboolean force_update)
+           nm_connection_get_id(nm_active_connection_get_applied_connection(best_ac)),
+           ip_iface);
+     _notify(self, PROP_DEFAULT_IP4_AC);
 +
-+	/* Recheck all connections to enable potential VPN depending on new route */
-+	schedule_activate_all(self);
+    /* Recheck all connections to enable potential VPN depending on new route */
+    schedule_activate_all(self);
 }
 
 static void
-@@ -2041,6 +2044,8 @@ device_recheck_auto_activate (NMDevice *device, gpointer user_data)
- 	NMPolicyPrivate *priv = user_data;
- 	NMPolicy *self = _PRIV_TO_SELF (priv);
+@@ -2200,6 +2203,8 @@ device_recheck_auto_activate(NMDevice *device, gpointer user_data)
+     NMPolicyPrivate *priv = user_data;
+     NMPolicy        *self = _PRIV_TO_SELF(priv);
 
-+	/* Reset retries count */
-+	reset_autoconnect_all(self, device, FALSE);
- 	schedule_activate_check (self, device);
+    /* Reset retries count */
+    reset_autoconnect_all(self, device, FALSE);
+     schedule_activate_check(self, device);
 }
 
 -- 
--- a/recipes-connectivity/networkmanager/networkmanager_%.bbappend
+++ b/recipes-connectivity/networkmanager/networkmanager_%.bbappend
@ -1,9 +1,9 @@
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}"

-RDEPENDS_${PN} = "networkmanager-conf"
+RDEPENDS:${PN} = "networkmanager-conf"

-SRC_URI_append = "\
+SRC_URI:append = "\
                 file://0001-Reactivate-GSM-connections-when-ModemManager-reconne.patch \
                 "

-PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq,,,dnsmasq"
+#PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq,,,dnsmasq"
--- a/recipes-connectivity/nmubxlib/nmubxlib.bb
+++ b/recipes-connectivity/nmubxlib/nmubxlib.bb
@ -2,7 +2,7 @@ DESCRIPTION = "Library implementing UBX protocol for u-blox gnss modems"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=331a9220a74b05f133bf1ef09b6903b2"

-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
    python3-setuptools \
    "

--- a/recipes-connectivity/tibluetooth/tibluetooth.bb
+++ b/recipes-connectivity/tibluetooth/tibluetooth.bb
@ -3,14 +3,14 @@ DESCRIPTION = "Run hciattach for ti bluetooth wl12xx module"
 AUTHOR = "Stefan Eichenberger"

 SECTION = "connectivity"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 PR = "r2"

 inherit systemd
 inherit allarch

-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
    firmware-ti-wl18xx \
    bash \
    libgpiod-tools \
@ -24,10 +24,10 @@ SRC_URI =  " \
 S = "${WORKDIR}"


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

-FILES_${PN}_append = " \
+FILES:${PN}:append = " \
                    ${nonarch_base_libdir} \
                    "

--- a/recipes-connectivity/ublox-gnss-fw-update/ublox-gnss-fw-update.bb
+++ b/recipes-connectivity/ublox-gnss-fw-update/ublox-gnss-fw-update.bb
@ -4,7 +4,7 @@ SECTION = "utils"


 LICENSE="Proprietary"
-LIC_FILES_CHKSUM="file://${COREBASE}/meta/files/common-licenses/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
+LIC_FILES_CHKSUM="file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"

 DEPENDS = "ncurses"

@ -36,7 +36,7 @@ do_install() {
    fi
 }

-FILES_${PN} = " \
+FILES:${PN} = " \
               ${bindir} \
               ${nonarch_base_libdir} \
              "
--- a/recipes-connectivity/wwan-config/wwan-config.bb
+++ b/recipes-connectivity/wwan-config/wwan-config.bb
@ -1,12 +1,11 @@
 DESCRIPTION = "WWAN modems configuration tool"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"

-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
    python3-pyserial \
    libgpiod-python \
    python3-setuptools \
-    python3-configparser \
    python3-systemd \
    lmsensors-sensors \
    lmsensors-config-libsensors \
@ -32,7 +31,7 @@ S = "${WORKDIR}/git"

 inherit setuptools3 

-do_install_append() {
+do_install:append() {
    install -d ${D}/${systemd_unitdir}/system/
    install -m 0644 ${WORKDIR}/wwan-config@.service ${D}/${systemd_unitdir}/system/

--- a/recipes-core/board-descriptor/board-descriptor.bb
+++ b/recipes-core/board-descriptor/board-descriptor.bb
@ -2,16 +2,16 @@ SUMMARY = "Boarddescriptor Tool"
 DESCRIPTION = "Read and write from/to the boarddescriptor"
 AUTHOR = "Stefan Eichenberger (stefan.eichenberger@netmodule.com)"

-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"

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

 inherit python3-dir

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

 SRC_URI =  " \
            file://bd.py \
@ -22,7 +22,7 @@ SRC_URI =  " \

 S = "${WORKDIR}"

-FILES_${PN} = " \
+FILES:${PN} = " \
            ${bindir}/* \
            ${libdir}/* \
            ${sysconfdir}/* \
--- a/recipes-firmware/firmware-ti-wl18xx/firmware-ti-wl18xx_%.bbappend
+++ b/recipes-firmware/firmware-ti-wl18xx/firmware-ti-wl18xx_%.bbappend
@ -1,8 +1,8 @@
-FILESEXTRAPATHS_append:= ":${THISDIR}/firmware-ti-wl18xx"
+FILESEXTRAPATHS:append:= ":${THISDIR}/firmware-ti-wl18xx"

-SRC_URI_append = " file://wl1271-nvs.bin "
+SRC_URI:append = " file://wl1271-nvs.bin "


-do_install_append() {
+do_install:append() {
        install -m 0644 ${WORKDIR}/wl1271-nvs.bin ${D}${nonarch_base_libdir}/firmware/ti-connectivity/wl1271-nvs.bin
 }
--- a/recipes-kernel/kernel-modules/wakeup-timer_1.0.bb
+++ b/recipes-kernel/kernel-modules/wakeup-timer_1.0.bb
@ -1,7 +1,7 @@
 DESCRIPTION = "Driver for wakeup from standby via AM335x dmtimer"
 HOMEPAGE = "http://www.netmodule.com/"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"

 inherit module

@ -11,6 +11,6 @@ PACKAGE_ARCH = "${TUNE_PKGARCH}"
 PV = "1.0.0"
 SRCREV ?= "1711171ae3bcc9f804d7973f4068cdd7cade78d0"

-SRC_URI = "git://github.com/netmodule/am335x-wakeup-timer.git;protocol=https"
+SRC_URI = "git://github.com/netmodule/am335x-wakeup-timer.git;protocol=https;branch=master"

 S = "${WORKDIR}/git"
--- a/recipes-kernel/linux/linux-netmodule.inc
+++ b/recipes-kernel/linux/linux-netmodule.inc
@ -4,11 +4,11 @@ inherit kernel

 DESCRIPTION = "Linux kernel for various NetModule hardware"

-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"

 # Avoids installing the kernel in /boot directory
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""

 # We are building one kernel for all machines with the same architecture
 PACKAGE_ARCH = "${TUNE_PKGARCH}"
@ -19,7 +19,7 @@ INITRAMFS_IMAGE_NAME = "-"

 S = "${WORKDIR}/git"

-INSANE_SKIP_${PN} += "version-going-backwards"
+INSANE_SKIP:${PN} += "version-going-backwards"

 copy_initramfs () {
    # We do not use this feature and it is depending on MACHINE variable
@ -28,7 +28,7 @@ copy_initramfs () {
 }

 #If a KERNEL_DEFCONFIG is specified, the defconfig specified in SRC_URI will be overwritten!
-do_configure_append(){
+do_configure:append(){
    if [ "${KERNEL_DEFCONFIG}" != "" ]; then
        oe_runmake ${KERNEL_DEFCONFIG}
    fi
--- a/recipes-kernel/linux/linux-netmodule_git-5.10.bb
+++ b/recipes-kernel/linux/linux-netmodule_git-5.10.bb
@ -4,5 +4,5 @@ SRC_URI = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;protocol=ssh;us
 SRCREV ?= "383b4b9a26c1e3ff804a66132842d31e43681b06"

 # Config fragments
-FILESEXTRAPATHS_prepend := "${THISDIR}/conf:"
-SRC_URI_append_netbird = " file://wlan.cfg"
+FILESEXTRAPATHS:prepend := "${THISDIR}/conf:"
+SRC_URI:append_netbird = " file://wlan.cfg"
--- a/recipes-kernel/linux/netmodule-fitimage.bb
+++ b/recipes-kernel/linux/netmodule-fitimage.bb
@ -1,7 +1,7 @@
 # Copyright (C) 2021 Lucien Mueller <lucien.mueller@netmodule.com>

 DESCRIPTION = "make fitimage"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"


 inherit kernel-fitimage
@ -18,7 +18,7 @@ KERNEL_IMAGETYPES = "fitImage"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

 PROVIDES = "virtual/netmodule-image"
-PROVIDES_sota = ""
+PROVIDES:sota = ""

 addtask assemble_fitimage_initramfs before do_install after do_compile
 addtask do_deploy after assemble_fitimage_initramfs
@ -29,7 +29,7 @@ UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"

 KERNEL_DEVICETREE = "${KERNEL_DEVICETREE_TO_USE}"

-do_configure_prepend () {
+do_configure:prepend () {
 	install -d ${S}/arch/${ARCH}/boot/
 	for DTB in ${KERNEL_DEVICETREE}; do
 		# We have to watch out for when the device-tree is located in its own subdirectory in the kernel sources.
--- a/recipes-kernel/system-state-framework/packagegroup-system-state-framework.bb
+++ b/recipes-kernel/system-state-framework/packagegroup-system-state-framework.bb
@ -1,14 +1,14 @@
 # Copyright (C) 2021 Netmodule AG
 DESCRIPTION = "implements a publish/subscribe broker for the various system state topics"
 HOMEPAGE = "http://www.netmodule.com/"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"   
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"

 inherit packagegroup

 PROVIDES = "${PN}"

-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
    ssc-broker-driver \
    ssc-sysstate-driver \
    "
--- a/recipes-kernel/system-state-framework/ssc-broker-driver_git.bb
+++ b/recipes-kernel/system-state-framework/ssc-broker-driver_git.bb
@ -2,8 +2,8 @@

 DESCRIPTION = "implements a publish/subscribe broker for the various system state topics"
 HOMEPAGE = "http://www.netmodule.com/"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"

 inherit module

@ -18,7 +18,7 @@ SRCREV ?= "4950e67e4a94bde44f8cf7a8c3f0c8eed8d18ad9"
 SRC_URI = "git://gitlab.com/netmodule/kernel/ssc-broker-driver.git;protocol=ssh;user=git;branch=develop"


-do_install_append () {
+do_install:append () {
    install -d ${D}${includedir}/broker
    install -m 0644 ${S}/broker.h ${D}${includedir}/broker/broker.h
    install -m 0644 ${S}/worker.h ${D}${includedir}/broker/worker.h
--- a/recipes-kernel/system-state-framework/ssc-extmod-driver_git.bb
+++ b/recipes-kernel/system-state-framework/ssc-extmod-driver_git.bb
@ -2,11 +2,11 @@

 DESCRIPTION = "implements a publish/subscribe broker for the various system state topics"
 HOMEPAGE = "http://www.netmodule.com/"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"

 DEPENDS = "ssc-broker-driver"
-RDEPENDS_${PN} = "ssc-broker-driver"
+RDEPENDS:${PN} = "ssc-broker-driver"

 inherit module

--- a/recipes-kernel/system-state-framework/ssc-sysstate-driver_git.bb
+++ b/recipes-kernel/system-state-framework/ssc-sysstate-driver_git.bb
@ -2,11 +2,11 @@

 DESCRIPTION = "implements a publish/subscribe broker for the various system state topics"
 HOMEPAGE = "http://www.netmodule.com/"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"

 DEPENDS = "ssc-broker-driver"
-RDEPENDS_${PN} = "ssc-broker-driver"
+RDEPENDS:${PN} = "ssc-broker-driver"

 inherit module

--- a/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
+++ b/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
@ -1,6 +1,6 @@
 SUMMARY = "Machine specific gpsd config"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"

 # empty by default
 # BSP layers can add stuff like meta-openmoko example:
--- a/recipes-navigation/gpsd/gpsd_%.bbappend
+++ b/recipes-navigation/gpsd/gpsd_%.bbappend
@ -2,7 +2,7 @@
 TTY_DEVICE = "/dev/gnss0"
 USBAUTO_STATE = "false"

-do_install_append () {
+do_install:append () {
    sed -i 's|DEVICES=""|DEVICES="${TTY_DEVICE}"|g' ${D}/etc/default/gpsd.default
    sed -i 's|USBAUTO="true"|USBAUTO="${USBAUTO_STATE}"|g' ${D}/etc/default/gpsd.default
Author	SHA1	Message	Date
Alexandre Bard	5c401fa0aa	Merge branch 'develop' into kirkstone	2022-08-18 13:31:58 +02:00
Alexandre Bard	033f3aec05	imx8 machine.conf: Fix include or architecture file The path has changed with kirkstone. Part of yocto upgrade from dunfell to kirkstone	2022-08-02 15:43:05 +02:00
Alexandre Bard	2752aadba3	wwan-config: Remove deprecated dependency to configparser configparser is part of python3-core. This packages was providing a backport for python2 Part of yocto upgrade from dunfell to kirkstone	2022-08-02 15:43:05 +02:00
Alexandre Bard	cc897e7021	cannelloni: Remove unnecessary recipe This recipe is now present in meta-networking Part of yocto upgrade from dunfell to kirkstone	2022-08-02 15:42:41 +02:00
Alexandre Bard	03a26e8997	Use new kirkstone licenses names The licenses names changed with kirkstone Part of yocto upgrade from dunfell to kirkstone	2022-08-02 15:42:41 +02:00
Alexandre Bard	1ccfb8aca8	machine/ti33x: Fix path to include tune file This changed with kirkstone Part of yocto upgrade from dunfell to kirkstone	2022-08-02 15:42:41 +02:00
Alexandre Bard	baa32f7fca	modemmanager: Update to 1.18.8 Version 1.14.8 was not buildable with kirkstone. The patches have been ported to a new branch on our fork of ModemManager. Part of yocto upgrade from dunfell to kirkstone	2022-08-02 15:41:13 +02:00
Marc Mattmueller	e64b7a32ba	machine: fixed IMAGE_BOOT_FILES for armada u-boot Part of yocto upgrade from dunfell to kirkstone Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>	2022-08-02 15:37:30 +02:00
Marc Mattmueller	0003dacf50	networkmanager: removed package config for dnsmasq needed to make networkmanager build Part of yocto upgrade from dunfell to kirkstone Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>	2022-08-02 15:37:26 +02:00
Marc Mattmueller	c1f4056736	fitImage: fixed syntax for the fitImage and the overwrite for ostree Part of yocto upgrade from dunfell to kirkstone Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>	2022-08-02 15:37:04 +02:00
Marc Mattmueller	26bb7e72f6	u-boot-armada: integrated remove-redundant-YYLOC-declaration patch This commit holds also the following patch: Same as the upstream fix for building dtc with gcc 10. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Whereas an additional file needed to be patched too to get rid of this multiple definition compile error. Part of yocto upgrade from dunfell to kirkstone Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>	2022-08-02 15:36:48 +02:00
Marc Mattmueller	1e7b74e76c	networkmanager: migrated reactivate gsm connections patch to kirkstone Part of yocto upgrade from dunfell to kirkstone Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>	2022-08-02 15:36:40 +02:00
Marc Mattmueller	ffe292ff47	general: migrated recipes and conf files from dunfell to kirkstone Part of yocto upgrade from dunfell to kirkstone Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>	2022-08-02 15:36:06 +02:00
				`@ -0,0 +1 @@`
				`../../../../meta-openembedded/meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch`