[rdkb][meta-filogic][Add support of kirkstone syntax]

[Description]
Add support of kirkstone syntax
- step1: convert-variable-renames
- step2: convert-srcuri
- step3: convert-overrides
- step4: convert-spdx-licenses

[Release-log]
N/A

Change-Id: I30f03906aabedf88ded8a3fb09a0f8755be6d25c
diff --git a/conf/machine/filogic.conf b/conf/machine/filogic.conf
index 9abf329..b5b11a2 100644
--- a/conf/machine/filogic.conf
+++ b/conf/machine/filogic.conf
@@ -35,6 +35,9 @@
 KERNEL_DEVICETREE_mt7987 = " \
     mediatek/mt7987a-spim-nand.dtb \
     "
+KERNEL_DEVICETREE_mt7987_emmc = " \
+    mediatek/mt7987a-emmc.dtb \
+    "
 KERNEL_DEVICETREE_mt7986_gsw = " \
     mediatek/mt7986a-2500wan-gsw-spim-nand-rfb.dtb \
     mediatek/mt7986b-2500wan-gsw-spim-nand-rfb.dtb \
diff --git a/recipes-bsp/airoha-eth-firmware/airoha-eth-firmware.bb b/recipes-bsp/airoha-eth-firmware/airoha-eth-firmware.bb
index e05e6b7..ef13b16 100644
--- a/recipes-bsp/airoha-eth-firmware/airoha-eth-firmware.bb
+++ b/recipes-bsp/airoha-eth-firmware/airoha-eth-firmware.bb
@@ -17,10 +17,10 @@
     install -m 644 ${WORKDIR}/EthMD32.DSP.bin ${D}${base_libdir}/firmware/
 }
 
-FILES_${PN} += "${base_libdir}/firmware/*"
+FILES:${PN} += "${base_libdir}/firmware/*"
 
 # Make Mediatek-eth-firmware depend on all of the split-out packages.
-python populate_packages_prepend () {
+python populate_packages:prepend () {
     firmware_pkgs = oe.utils.packages_filter_out_system(d)
-    d.appendVar('RDEPENDS_mediatek-eth-firmware', ' ' + ' '.join(firmware_pkgs))
+    d.appendVar('RDEPENDS:mediatek-eth-firmware', ' ' + ' '.join(firmware_pkgs))
 }
diff --git a/recipes-bsp/marvell-eth-firmware/marvell-eth-firmware.bb b/recipes-bsp/marvell-eth-firmware/marvell-eth-firmware.bb
index b1ad94d..c2a8f14 100644
--- a/recipes-bsp/marvell-eth-firmware/marvell-eth-firmware.bb
+++ b/recipes-bsp/marvell-eth-firmware/marvell-eth-firmware.bb
@@ -20,10 +20,10 @@
     install -m 644 ${WORKDIR}/AQR-G4_v5.7.0-AQR_EVB_Generic_X3410_StdCfg_MDISwap_USX_ID46316_VER2148.cld  ${D}${base_libdir}/firmware/
 }
 
-FILES_${PN} += "${base_libdir}/firmware/"
+FILES:${PN} += "${base_libdir}/firmware/"
 
 # Make marvell-eth-firmware depend on all of the split-out packages.
-python populate_packages_prepend () {
+python populate_packages:prepend () {
     firmware_pkgs = oe.utils.packages_filter_out_system(d)
-    d.appendVar('RDEPENDS_marvell-eth-firmware', ' ' + ' '.join(firmware_pkgs))
+    d.appendVar('RDEPENDS:marvell-eth-firmware', ' ' + ' '.join(firmware_pkgs))
 }
diff --git a/recipes-bsp/mediatek-eth-firmware/mediatek-eth-firmware.bb b/recipes-bsp/mediatek-eth-firmware/mediatek-eth-firmware.bb
index 72f2a64..25418b6 100644
--- a/recipes-bsp/mediatek-eth-firmware/mediatek-eth-firmware.bb
+++ b/recipes-bsp/mediatek-eth-firmware/mediatek-eth-firmware.bb
@@ -23,10 +23,10 @@
     install -m 644 ${WORKDIR}/mt7987/* ${D}${base_libdir}/firmware/mediatek/mt7987/
 }
 
-FILES_${PN} += "${base_libdir}/firmware/mediatek/*"
+FILES:${PN} += "${base_libdir}/firmware/mediatek/*"
 
 # Make Mediatek-eth-firmware depend on all of the split-out packages.
-python populate_packages_prepend () {
+python populate_packages:prepend () {
     firmware_pkgs = oe.utils.packages_filter_out_system(d)
-    d.appendVar('RDEPENDS_mediatek-eth-firmware', ' ' + ' '.join(firmware_pkgs))
+    d.appendVar('RDEPENDS:mediatek-eth-firmware', ' ' + ' '.join(firmware_pkgs))
 }
diff --git a/recipes-bsp/u-boot/libubootenv_%.bbappend b/recipes-bsp/u-boot/libubootenv_%.bbappend
index fa68388..0a0e8d7 100644
--- a/recipes-bsp/u-boot/libubootenv_%.bbappend
+++ b/recipes-bsp/u-boot/libubootenv_%.bbappend
@@ -2,7 +2,7 @@
 
 
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI += " file://fw_env.config \
              file://fw_env_emmc.config \
         "
@@ -11,7 +11,7 @@
 
 
 
-do_install_append () {
+do_install:append () {
 	install -d ${D}${sysconfdir}
 	if ${@bb.utils.contains('DISTRO_FEATURES','emmc','true','false',d)}; then
 		install -m 0644 ${WORKDIR}/fw_env_emmc.config ${D}${sysconfdir}/fw_env.config
diff --git a/recipes-ccsp/hal/hal-cm-generic_git.bbappend b/recipes-ccsp/hal/hal-cm-generic_git.bbappend
index feb233c..a7c85ed 100644
--- a/recipes-ccsp/hal/hal-cm-generic_git.bbappend
+++ b/recipes-ccsp/hal/hal-cm-generic_git.bbappend
@@ -1,4 +1,4 @@
-do_configure_prepend(){
+do_configure:prepend(){
         if ! cat ${S}/cm_hal.c | grep -w  "INT cm_hal_snmpv3_kickstart_initialize(snmpv3_kickstart_table_t \*pKickstart_Table)" ; then
                 echo "INT cm_hal_snmpv3_kickstart_initialize(snmpv3_kickstart_table_t *pKickstart_Table) { return RETURN_OK; }" >> ${S}/cm_hal.c
         fi
diff --git a/recipes-ccsp/hal/hal-dhcpv4c-generic_git.bbappend b/recipes-ccsp/hal/hal-dhcpv4c-generic_git.bbappend
index 32d91a3..3972792 100644
--- a/recipes-ccsp/hal/hal-dhcpv4c-generic_git.bbappend
+++ b/recipes-ccsp/hal/hal-dhcpv4c-generic_git.bbappend
@@ -1,10 +1,10 @@
-SRC_URI += "git://gerrit.mediatek.inc/gateway/rdk-b/rdkb_hal;protocol=https;destsuffix=git/source/dhcpv4c/rdkb_hal"
+SRC_URI += "git://gerrit.mediatek.inc/gateway/rdk-b/rdkb_hal;protocol=https;destsuffix=git/source/dhcpv4c/rdkb_hal;branch=master"
 
 SRCREV = "${AUTOREV}"
 
-#CFLAGS_append = " -DUDHCPC_SWITCH "
+#CFLAGS:append = " -DUDHCPC_SWITCH "
 
-do_configure_prepend(){
+do_configure:prepend(){
     rm ${S}/dhcpv4c_api.c
     ln -sf ${S}/rdkb_hal/src/dhcpv4c/dhcpv4c_api.c ${S}/dhcpv4c_api.c
 }
diff --git a/recipes-ccsp/hal/hal-ethsw-generic_git.bbappend b/recipes-ccsp/hal/hal-ethsw-generic_git.bbappend
index c3c0cc5..64fc41b 100644
--- a/recipes-ccsp/hal/hal-ethsw-generic_git.bbappend
+++ b/recipes-ccsp/hal/hal-ethsw-generic_git.bbappend
@@ -2,11 +2,11 @@
 
 SRCREV = "${AUTOREV}"
 
-CFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', ' -DFEATURE_RDKB_WAN_MANAGER ', '', d)}"
+CFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', ' -DFEATURE_RDKB_WAN_MANAGER ', '', d)}"
 
-CFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'three_gmac', ' -DTHREE_GMACS_SUPPORT ', '', d)}"
+CFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'three_gmac', ' -DTHREE_GMACS_SUPPORT ', '', d)}"
 
-do_configure_prepend(){
+do_configure:prepend(){
    if ${@bb.utils.contains('DISTRO_FEATURES','switch_gsw_mode','true','false',d)}; then
    ln -sf ${S}/rdkb_hal/src/ethsw/ccsp_hal_ethsw_gsw.c ${S}/ccsp_hal_ethsw.c
    else
diff --git a/recipes-ccsp/hal/hal-fwupgrade.bb b/recipes-ccsp/hal/hal-fwupgrade.bb
index 17fe24d..e8acc23 100644
--- a/recipes-ccsp/hal/hal-fwupgrade.bb
+++ b/recipes-ccsp/hal/hal-fwupgrade.bb
@@ -1,9 +1,9 @@
 SUMMARY = "HAL for RDK CCSP components"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://../../LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 PROVIDES = "hal-fwupgrade"
-RPROVIDES_${PN} = "hal-fwupgrade"
+RPROVIDES:${PN} = "hal-fwupgrade"
 
 DEPENDS += "ccsp-common-library halinterface"
 DEPENDS_kirkstone += " rdkb-halif-fwupgrade"
@@ -18,7 +18,7 @@
 S = "${WORKDIR}/git/src/fwupgrade"
 
 CFLAGS += "-DFEATURE_SUPPORT_RDKLOG"
-CFLAGS_append = " -I=${includedir}/ccsp "
+CFLAGS:append = " -I=${includedir}/ccsp "
 
 inherit autotools coverity
 
diff --git a/recipes-ccsp/hal/hal-platform-generic_git.bbappend b/recipes-ccsp/hal/hal-platform-generic_git.bbappend
index 9cd0f29..e71bf7b 100644
--- a/recipes-ccsp/hal/hal-platform-generic_git.bbappend
+++ b/recipes-ccsp/hal/hal-platform-generic_git.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI += "git://gerrit.mediatek.inc/gateway/rdk-b/rdkb_hal;branch=master;protocol=https;destsuffix=git/source/platform/rdkb_hal"
 
@@ -6,11 +6,11 @@
 SRCREV = "${AUTOREV}"
 
 DEPENDS += "utopia-headers"
-CFLAGS_append = " \
+CFLAGS:append = " \
     -I=${includedir}/utctx \
 "
 
-do_configure_prepend(){
+do_configure:prepend(){
     rm ${S}/platform_hal.c
     ln -sf ${S}/rdkb_hal/src/platform/platform_hal.c ${S}/platform_hal.c
 }
\ No newline at end of file
diff --git a/recipes-devtools/fdt-patch-dm-verify/fdt-patch-dm-verify.bb b/recipes-devtools/fdt-patch-dm-verify/fdt-patch-dm-verify.bb
index 178315c..5a925ad 100644
--- a/recipes-devtools/fdt-patch-dm-verify/fdt-patch-dm-verify.bb
+++ b/recipes-devtools/fdt-patch-dm-verify/fdt-patch-dm-verify.bb
@@ -1,6 +1,6 @@
 SUMMARY = "fdt-patch-dm-verify"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 
diff --git a/recipes-devtools/fit-rootfs-hash-tool/fit-rootfs-hash-tool_1.0.bb b/recipes-devtools/fit-rootfs-hash-tool/fit-rootfs-hash-tool_1.0.bb
index 99f0733..9136f91 100644
--- a/recipes-devtools/fit-rootfs-hash-tool/fit-rootfs-hash-tool_1.0.bb
+++ b/recipes-devtools/fit-rootfs-hash-tool/fit-rootfs-hash-tool_1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Tool for adding rootfs hash node to FIT image"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 SRC_URI = " \
diff --git a/recipes-devtools/fitblk/fitblk.bb b/recipes-devtools/fitblk/fitblk.bb
index eb89900..4a592de 100644
--- a/recipes-devtools/fitblk/fitblk.bb
+++ b/recipes-devtools/fitblk/fitblk.bb
@@ -1,6 +1,6 @@
 SUMMARY = "fitblk firmware release tool"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c188eeeb69c0a05d0545816f1458a0c9"
 
 SRC_URI = " \
@@ -21,6 +21,6 @@
     install -m 0755 ${S}/fit.sh ${D}/lib/upgrade
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
             /lib/upgrade \
             "
\ No newline at end of file
diff --git a/recipes-devtools/flowtable/flowtable.bb b/recipes-devtools/flowtable/flowtable.bb
index 007bece..fad7cae 100644
--- a/recipes-devtools/flowtable/flowtable.bb
+++ b/recipes-devtools/flowtable/flowtable.bb
@@ -1,6 +1,6 @@
 SUMMARY = "netfilter_flowtable tools"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 
@@ -13,7 +13,7 @@
 
 S = "${WORKDIR}/git/src"
 
-CFLAGS_prepend = " \
+CFLAGS:prepend = " \
     -fPIC -D_GNU_SOURCE \
     -I${S} \
     "
diff --git a/recipes-devtools/fw-upgrade/fw-upgrade_1.0.bb b/recipes-devtools/fw-upgrade/fw-upgrade_1.0.bb
index 0df86e5..fe0e21b 100644
--- a/recipes-devtools/fw-upgrade/fw-upgrade_1.0.bb
+++ b/recipes-devtools/fw-upgrade/fw-upgrade_1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "firmware upgrade tool"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 S = "${WORKDIR}"
@@ -17,7 +17,7 @@
 
 
 
-FILES_${PN} += " \
+FILES:${PN} += " \
             /lib/upgrade \
             "
 
diff --git a/recipes-devtools/init-filogic/init-filogic.bb b/recipes-devtools/init-filogic/init-filogic.bb
index 83e80af..cad5753 100644
--- a/recipes-devtools/init-filogic/init-filogic.bb
+++ b/recipes-devtools/init-filogic/init-filogic.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Init filogic "
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 S = "${WORKDIR}"
@@ -11,17 +11,17 @@
     file://COPYING \
     "
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " init-IPv6.service"
-SYSTEMD_SERVICE_${PN} += " init-Lanbridge.service"
-SYSTEMD_SERVICE_${PN} += " init-PPPQ.service"
-SYSTEMD_SERVICE_${PN} += " usb-mount@.service"
-FILES_${PN} += "{systemd_unitdir}/system/init-IPv6.service"
-FILES_${PN} += "{systemd_unitdir}/system/init-Lanbridge.service"
-FILES_${PN} += "{systemd_unitdir}/system/init-PPPQ.service"
-FILES_${PN} += "{systemd_unitdir}/system/usb-mount@.service"
+SYSTEMD_SERVICE:${PN} = " init-IPv6.service"
+SYSTEMD_SERVICE:${PN} += " init-Lanbridge.service"
+SYSTEMD_SERVICE:${PN} += " init-PPPQ.service"
+SYSTEMD_SERVICE:${PN} += " usb-mount@.service"
+FILES:${PN} += "{systemd_unitdir}/system/init-IPv6.service"
+FILES:${PN} += "{systemd_unitdir}/system/init-Lanbridge.service"
+FILES:${PN} += "{systemd_unitdir}/system/init-PPPQ.service"
+FILES:${PN} += "{systemd_unitdir}/system/usb-mount@.service"
 
 do_install() {
     install -d ${D}${sbindir}
diff --git a/recipes-devtools/initrd/systemd_%.bbappend b/recipes-devtools/initrd/systemd_%.bbappend
index b5786e6..38b5f09 100644
--- a/recipes-devtools/initrd/systemd_%.bbappend
+++ b/recipes-devtools/initrd/systemd_%.bbappend
@@ -1,13 +1,13 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append = " file://init_readonlyfs.sh \
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI:append = " file://init_readonlyfs.sh \
                    file://init_readonlyfs-emmc.sh \
                    file://kernelv6-init_readonlyfs.sh \
                    file://kernelv6-init_readonlyfs-emmc.sh \
                  "
-FILES_${PN} += " /overlay \
+FILES:${PN} += " /overlay \
                /rom \"
 
-do_install_append() {
+do_install:append() {
        if ${@bb.utils.contains('DISTRO_FEATURES','kernel_in_ubi','true','false',d)}; then
               install -d ${D}/overlay
               install -d ${D}/rom
@@ -29,4 +29,4 @@
        fi
 }
 
-FILES_${PN} += " ${rootlibexecdir}/init_readonlyfs.sh "
+FILES:${PN} += " ${rootlibexecdir}/init_readonlyfs.sh "
diff --git a/recipes-devtools/ksmbd/ksmbd-tools_3.4.5.bb b/recipes-devtools/ksmbd/ksmbd-tools_3.4.5.bb
index a2c18fd..dcf7ff3 100644
--- a/recipes-devtools/ksmbd/ksmbd-tools_3.4.5.bb
+++ b/recipes-devtools/ksmbd/ksmbd-tools_3.4.5.bb
@@ -1,6 +1,6 @@
 SUMMARY = " a collection of userspace utilities for the ksmbd kernel server"
 SECTION = "Applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 inherit autotools pkgconfig systemd
@@ -8,7 +8,7 @@
 DEPENDS += "ksmbd libnl glib-2.0"
 
 SRC_URI = " \
-    git://git@github.com/cifsd-team/ksmbd-tools.git;protocol=https;tag=${PV} \
+    git://git@github.com/cifsd-team/ksmbd-tools.git;protocol=https;tag=${PV};branch=master \
     file://smb.conf \
     file://ksmbd.service \
     file://COPYING;subdir=git \
@@ -19,8 +19,8 @@
 S = "${WORKDIR}/git"
 
 #EXTRA_OECONF += "GLIB_LIBS="${STAGING_LIBDIR}/libglib-2.0.a""
-EXTRA_OECONF_append  = " --disable-shared --enable-static"
-CFLAGS_prepend = " \
+EXTRA_OECONF:append  = " --disable-shared --enable-static"
+CFLAGS:prepend = " \
     -D_GNU_SOURCE \
     -I${STAGING_INCDIR}/libnl3 \
     -I${STAGING_INCDIR}/glib-2.0 \
@@ -31,10 +31,10 @@
 LDFLAGS += " -lglib-2.0"
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " ksmbd.service"
-FILES_${PN} += "{systemd_unitdir}/system/ksmbd.service"
+SYSTEMD_SERVICE:${PN} = " ksmbd.service"
+FILES:${PN} += "{systemd_unitdir}/system/ksmbd.service"
 
-do_install_append () {
+do_install:append () {
 	install -d ${D}${systemd_unitdir}/system/
 	install -m 0644 ${WORKDIR}/ksmbd.service ${D}${systemd_unitdir}/system
     install -d ${D}/etc/ksmbd
diff --git a/recipes-devtools/ksmbd/ksmbd_3.4.5.bb b/recipes-devtools/ksmbd/ksmbd_3.4.5.bb
index 7ce0526..49fee73 100644
--- a/recipes-devtools/ksmbd/ksmbd_3.4.5.bb
+++ b/recipes-devtools/ksmbd/ksmbd_3.4.5.bb
@@ -1,6 +1,6 @@
 SUMMARY = "a linux kernel server which implements SMB3 protocol in kernel space for sharing files over network"
 SECTION = "Drivers"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 inherit module
@@ -8,7 +8,7 @@
 DEPENDS = "virtual/kernel"
 
 SRC_URI = " \
-    git://git@github.com/cifsd-team/ksmbd.git;protocol=https;tag=${PV} \
+    git://git@github.com/cifsd-team/ksmbd.git;protocol=https;tag=${PV};branch=master \
     file://COPYING;subdir=git \
     "
 
diff --git a/recipes-devtools/mac-sec/mac-sec.bb b/recipes-devtools/mac-sec/mac-sec.bb
index c468201..67ac054 100644
--- a/recipes-devtools/mac-sec/mac-sec.bb
+++ b/recipes-devtools/mac-sec/mac-sec.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Init filogic "
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 S = "${WORKDIR}"
@@ -13,9 +13,9 @@
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-SYSTEMD_SERVICE_${PN} = " MACSec.service"
-FILES_${PN} += "{systemd_unitdir}/system/MACSec.service"
+SYSTEMD_AUTO_ENABLE:${PN} = "disable"
+SYSTEMD_SERVICE:${PN} = " MACSec.service"
+FILES:${PN} += "{systemd_unitdir}/system/MACSec.service"
 
 do_install() {
     install -d ${D}${sbindir}
diff --git a/recipes-devtools/mii-mgr/mii-mgr_1.0.bb b/recipes-devtools/mii-mgr/mii-mgr_1.0.bb
index c233ebe..5030fb0 100644
--- a/recipes-devtools/mii-mgr/mii-mgr_1.0.bb
+++ b/recipes-devtools/mii-mgr/mii-mgr_1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "An program to read/write from/to phy from userspace"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c188eeeb69c0a05d0545816f1458a0c9"
 
 SRC_URI = " \
diff --git a/recipes-devtools/mtd/mtd.bb b/recipes-devtools/mtd/mtd.bb
index 4006638..acc68d2 100644
--- a/recipes-devtools/mtd/mtd.bb
+++ b/recipes-devtools/mtd/mtd.bb
@@ -1,7 +1,7 @@
 #Basic Configuration
 DESCRIPTION = "Mtd tool"
 SECTION = "base"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c188eeeb69c0a05d0545816f1458a0c9"
 
 DEPENDS += "libubox"
@@ -17,12 +17,12 @@
 
 META_LDFLAGS_ADD = "-lubox"
 
-LDFLAGS_remove = "-Wl,--as-needed"
+LDFLAGS:remove = "-Wl,--as-needed"
 
-CFLAGS_append = " -Wall -flto"
-LDFLAGS_append = " -flto=jobserver ${META_LDFLAGS_ADD}"
+CFLAGS:append = " -Wall -flto"
+LDFLAGS:append = " -flto=jobserver ${META_LDFLAGS_ADD}"
 
-do_compile_prepend(){
+do_compile:prepend(){
     cd ${S}
 }
 
diff --git a/recipes-devtools/mtk-factory-rw/mtk-factory-rw.bb b/recipes-devtools/mtk-factory-rw/mtk-factory-rw.bb
index 66eacd7..27e6dd1 100644
--- a/recipes-devtools/mtk-factory-rw/mtk-factory-rw.bb
+++ b/recipes-devtools/mtk-factory-rw/mtk-factory-rw.bb
@@ -1,6 +1,6 @@
 SUMMARY = "mtk factory read and write"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 S = "${WORKDIR}"
@@ -15,8 +15,8 @@
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " init-MacAddr.service"
-FILES_${PN} += "{systemd_unitdir}/system/init-MacAddr.service"
+SYSTEMD_SERVICE:${PN} = " init-MacAddr.service"
+FILES:${PN} += "{systemd_unitdir}/system/init-MacAddr.service"
 
 do_install() {
     install -d ${D}${sbindir}
diff --git a/recipes-devtools/mtkhnat-util/mtkhnat-util.bb b/recipes-devtools/mtkhnat-util/mtkhnat-util.bb
index c5fe40f..7cf8e84 100644
--- a/recipes-devtools/mtkhnat-util/mtkhnat-util.bb
+++ b/recipes-devtools/mtkhnat-util/mtkhnat-util.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Hardware-QoS-tool"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 DEPENDS += "libnl-tiny uci"
@@ -14,9 +14,9 @@
 
 S = "${WORKDIR}/git/src"
 
-CFLAGS_append = " -luci "
+CFLAGS:append = " -luci "
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${sysconfdir}
     install -d ${D}${sysconfdir}/config
     install -m 0755 ${WORKDIR}/git/src/mtkhnat.config ${D}${sysconfdir}/config/mtkhnat
diff --git a/recipes-devtools/regs/regs_1.0.bb b/recipes-devtools/regs/regs_1.0.bb
index 7761918..3db120c 100644
--- a/recipes-devtools/regs/regs_1.0.bb
+++ b/recipes-devtools/regs/regs_1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "An program to read/write from/to a pci device from userspace"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c188eeeb69c0a05d0545816f1458a0c9"
 
 SRC_URI = " \
diff --git a/recipes-devtools/smp/smp_1.0.bb b/recipes-devtools/smp/smp_1.0.bb
index ceaaf88..3b7e3d3 100644
--- a/recipes-devtools/smp/smp_1.0.bb
+++ b/recipes-devtools/smp/smp_1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "SMP IRQ Affinity tool"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 S = "${WORKDIR}"
@@ -14,8 +14,8 @@
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " smp.service"
-FILES_${PN} += "{systemd_unitdir}/system/smp.service"
+SYSTEMD_SERVICE:${PN} = " smp.service"
+FILES:${PN} += "{systemd_unitdir}/system/smp.service"
 
 do_install() {
     install -d ${D}${sbindir}
diff --git a/recipes-devtools/switch/switch_1.0.bb b/recipes-devtools/switch/switch_1.0.bb
index a16e0d6..84fdde8 100644
--- a/recipes-devtools/switch/switch_1.0.bb
+++ b/recipes-devtools/switch/switch_1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Command to config switch"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 
@@ -14,7 +14,7 @@
 
 S = "${WORKDIR}/git/src"
 
-CFLAGS_prepend = " \
+CFLAGS:prepend = " \
     -D_GNU_SOURCE \
     -I${STAGING_INCDIR}/libnl3 \
     -I${S} \
diff --git a/recipes-extended/dmsetup/dmsetup_2.03.06.bb b/recipes-extended/dmsetup/dmsetup_2.03.06.bb
index d08e0b5..7645c20 100644
--- a/recipes-extended/dmsetup/dmsetup_2.03.06.bb
+++ b/recipes-extended/dmsetup/dmsetup_2.03.06.bb
@@ -1,13 +1,13 @@
 HOMEPAGE = "https://www.sourceware.org/lvm2/"
 SECTION = "utils"
 DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux."
-LICENSE = "GPLv2 & LGPLv2.1"
+LICENSE = "GPL-2.0-only & LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \
                     file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24"
 
 DEPENDS += "libaio"
 
-SRC_URI = "git://sourceware.org/git/lvm2.git \
+SRC_URI = "git://sourceware.org/git/lvm2.git;branch=master \
            file://lvm.conf \
            file://0001-implement-libc-specific-reopen_stream.patch \
            file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \
@@ -22,7 +22,7 @@
 inherit autotools-brokensep pkgconfig systemd license
 
 LVM2_PACKAGECONFIG = "dmeventd"
-LVM2_PACKAGECONFIG_append_class-target = " \
+LVM2_PACKAGECONFIG:append:class-target = " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
     ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \
 "
diff --git a/recipes-extended/iptables/iptables_%.bbappend b/recipes-extended/iptables/iptables_%.bbappend
index 4434da2..642b6a2 100644
--- a/recipes-extended/iptables/iptables_%.bbappend
+++ b/recipes-extended/iptables/iptables_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append = " file://800-flowoffload_target.patch \
+SRC_URI:append = " file://800-flowoffload_target.patch \
                  "
\ No newline at end of file
diff --git a/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bbappend b/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bbappend
index d93c9b5..556f730 100644
--- a/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bbappend
+++ b/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append += "file://0001-rdkb-support-netfilter-netlink-ftnl-tools.patch"
+SRC_URI:append += "file://0001-rdkb-support-netfilter-netlink-ftnl-tools.patch"
diff --git a/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index 2d4429b..2675e12 100644
--- a/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -2,7 +2,7 @@
 HOMEPAGE = "https://www.kernel.org/"
 DESCRIPTION = "Designed to maintain an Application Programming Interface (API) stable version of the Linux headers"
 SECTION = "devel"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 #########################################################################
 ####                        PLEASE READ 
@@ -70,15 +70,15 @@
 	find ${D}${includedir} -name ..install.cmd | xargs rm -f
 }
 
-do_install_append_aarch64 () {
+do_install:append:aarch64 () {
         do_install_armmultilib
 }
 
-do_install_append_arm () {
+do_install:append:arm () {
 	do_install_armmultilib
 }
 
-do_install_append_armeb () {
+do_install:append:armeb () {
 	do_install_armmultilib
 }
 
@@ -89,8 +89,8 @@
 
 BBCLASSEXTEND = "nativesdk"
 
-RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
+RDEPENDS:${PN}-dev = ""
+RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native bison-native rsync-native"
diff --git a/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb b/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb
index 8a12103..6d97afe 100644
--- a/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb
+++ b/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb
@@ -1,13 +1,13 @@
 require linux-libc-headers.inc
 
-SRC_URI_append_libc-musl = "\
+SRC_URI:append:libc-musl = "\
     file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \
     file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
     file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \
     file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \
    "
 
-SRC_URI_append = "\
+SRC_URI:append = "\
     file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \
     file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \
 "
diff --git a/recipes-kernel/linux/linux-mediatek-5.4/generic/backport-5.4/backport-5.4.inc b/recipes-kernel/linux/linux-mediatek-5.4/generic/backport-5.4/backport-5.4.inc
index 4a3ac15..e910b1e 100644
--- a/recipes-kernel/linux/linux-mediatek-5.4/generic/backport-5.4/backport-5.4.inc
+++ b/recipes-kernel/linux/linux-mediatek-5.4/generic/backport-5.4/backport-5.4.inc
@@ -1,5 +1,5 @@
 #patch backport-5.4 (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch \
     file://011-kbuild-export-SUBARCH.patch \
     file://030-modpost-add-a-helper-to-get-data-pointed-by-a-symbol.patch \
diff --git a/recipes-kernel/linux/linux-mediatek-5.4/generic/hack-5.4/hack-5.4.inc b/recipes-kernel/linux/linux-mediatek-5.4/generic/hack-5.4/hack-5.4.inc
index 17e6307..f015024 100644
--- a/recipes-kernel/linux/linux-mediatek-5.4/generic/hack-5.4/hack-5.4.inc
+++ b/recipes-kernel/linux/linux-mediatek-5.4/generic/hack-5.4/hack-5.4.inc
@@ -1,5 +1,5 @@
 #patch hack-5.4 (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://204-module_strip.patch \
     file://210-darwin_scripts_include.patch \
     file://211-darwin-uuid-typedef-clash.patch \
diff --git a/recipes-kernel/linux/linux-mediatek-5.4/generic/pending-5.4/pending-5.4.inc b/recipes-kernel/linux/linux-mediatek-5.4/generic/pending-5.4/pending-5.4.inc
index ba187a8..83b45a7 100644
--- a/recipes-kernel/linux/linux-mediatek-5.4/generic/pending-5.4/pending-5.4.inc
+++ b/recipes-kernel/linux/linux-mediatek-5.4/generic/pending-5.4/pending-5.4.inc
@@ -1,5 +1,5 @@
 #patch pending-5.4 (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch \
     file://102-MIPS-only-process-negative-stack-offsets-on-stack-tr.patch \
     file://103-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch \
diff --git a/recipes-kernel/linux/linux-mediatek-5.4/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7987a-emmc.dts b/recipes-kernel/linux/linux-mediatek-5.4/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7987a-emmc.dts
index b737ff6..a5cf558 100644
--- a/recipes-kernel/linux/linux-mediatek-5.4/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7987a-emmc.dts
+++ b/recipes-kernel/linux/linux-mediatek-5.4/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7987a-emmc.dts
@@ -2,7 +2,7 @@
 
 /dts-v1/;
 #include "mt7987a.dtsi"
-#include "mt7987-netsys-gmac123.dtsi"
+#include "mt7987-netsys-gmac12.dtsi"
 #include "mt7987-emmc.dtsi"
 #include <dt-bindings/input/input.h>
 
diff --git a/recipes-kernel/linux/linux-mediatek-5.4/mediatek/patches-5.4/999-4100-mtk-tunnel-offload-support.patch b/recipes-kernel/linux/linux-mediatek-5.4/mediatek/patches-5.4/999-4100-mtk-tunnel-offload-support.patch
new file mode 100644
index 0000000..1cf7862
--- /dev/null
+++ b/recipes-kernel/linux/linux-mediatek-5.4/mediatek/patches-5.4/999-4100-mtk-tunnel-offload-support.patch
@@ -0,0 +1,24 @@
+--- a/include/net/netfilter/nf_flow_table.h
++++ b/include/net/netfilter/nf_flow_table.h
+@@ -179,10 +179,21 @@ struct flow_offload {
+ 	struct rcu_head				rcu_head;
+ };
+ 
++enum flow_offload_tnl {
++	FLOW_OFFLOAD_TNL_GRETAP,
++	FLOW_OFFLOAD_TNL_PPTP,
++	FLOW_OFFLOAD_TNL_L2TP_V2,
++	FLOW_OFFLOAD_TNL_L2TP_V3,
++	FLOW_OFFLOAD_TNL_VXLAN,
++	FLOW_OFFLOAD_NATT,
++	__FLOW_OFFLOAD_MAX,
++};
++
+ struct flow_offload_hw_path {
+ 	struct net_device *dev;
+ 	struct net_device *virt_dev;
+ 	u32 flags;
++	u32 tnl_type;
+ 
+ 	u8 eth_src[ETH_ALEN];
+ 	u8 eth_dest[ETH_ALEN];
diff --git a/recipes-kernel/linux/linux-mediatek-5.4/mediatek/patches-5.4/patches-5.4.inc b/recipes-kernel/linux/linux-mediatek-5.4/mediatek/patches-5.4/patches-5.4.inc
index 1a3badc..c53644e 100644
--- a/recipes-kernel/linux/linux-mediatek-5.4/mediatek/patches-5.4/patches-5.4.inc
+++ b/recipes-kernel/linux/linux-mediatek-5.4/mediatek/patches-5.4/patches-5.4.inc
@@ -1,5 +1,5 @@
 #patch patches-5.4 (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-v5.7-spi-make-spi-max-frequency-optional.patch \
     file://0002-v5.7-spi-add-support-for-mediatek-spi-nor-controller.patch \
     file://0003-switch-add-mt7531.patch \
@@ -260,4 +260,5 @@
     file://999-2910-dm-verity-redo-hash-for-safexel-sha256.patch;apply=no \
     file://999-2911-dm-support-get-device-by-part-uuid-and-label.patch;apply=no \
     file://999-2912-dm-expose-create-parameter-to-sysfs.patch;apply=no \
+    file://999-4100-mtk-tunnel-offload-support.patch;apply=no \
     "
diff --git a/recipes-kernel/linux/linux-mediatek-6.6/generic/backport-6.6/backport-6.6.inc b/recipes-kernel/linux/linux-mediatek-6.6/generic/backport-6.6/backport-6.6.inc
index 4af8677..9985e2c 100644
--- a/recipes-kernel/linux/linux-mediatek-6.6/generic/backport-6.6/backport-6.6.inc
+++ b/recipes-kernel/linux/linux-mediatek-6.6/generic/backport-6.6/backport-6.6.inc
@@ -1,5 +1,5 @@
 #patch backport-6.6 (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0080-v6.9-smp-Avoid-setup_max_cpus_namespace_collision_shadowing.patch \
     file://065-v6.10-compiler_types.h-Define-__retain.patch \
     file://066-v6.10-bpf-Harden-__bpf_kfunc-against-linker-removal.patch \
diff --git a/recipes-kernel/linux/linux-mediatek-6.6/generic/hack-6.6/hack-6.6.inc b/recipes-kernel/linux/linux-mediatek-6.6/generic/hack-6.6/hack-6.6.inc
index 7db251b..7b061be 100644
--- a/recipes-kernel/linux/linux-mediatek-6.6/generic/hack-6.6/hack-6.6.inc
+++ b/recipes-kernel/linux/linux-mediatek-6.6/generic/hack-6.6/hack-6.6.inc
@@ -1,5 +1,5 @@
 #patch hack-6.6 (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://200-tools_portability.patch \
     file://204-module_strip.patch \
     file://205-kconfig-abort-configuration-on-unset-symbol.patch \
diff --git a/recipes-kernel/linux/linux-mediatek-6.6/generic/pending-6.6/pending-6.6.inc b/recipes-kernel/linux/linux-mediatek-6.6/generic/pending-6.6/pending-6.6.inc
index bb6ea6d..d20b416 100644
--- a/recipes-kernel/linux/linux-mediatek-6.6/generic/pending-6.6/pending-6.6.inc
+++ b/recipes-kernel/linux/linux-mediatek-6.6/generic/pending-6.6/pending-6.6.inc
@@ -1,5 +1,5 @@
 #patch pending-6.6 (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch \
     file://102-MIPS-only-process-negative-stack-offsets-on-stack-tr.patch \
     file://103-kbuild-export-SUBARCH.patch \
diff --git a/recipes-kernel/linux/linux-mediatek-6.6/mediatek/patches-6.6/patches-6.6.inc b/recipes-kernel/linux/linux-mediatek-6.6/mediatek/patches-6.6/patches-6.6.inc
index 9a455d7..b4789a8 100644
--- a/recipes-kernel/linux/linux-mediatek-6.6/mediatek/patches-6.6/patches-6.6.inc
+++ b/recipes-kernel/linux/linux-mediatek-6.6/mediatek/patches-6.6/patches-6.6.inc
@@ -1,5 +1,5 @@
 #patch patches-6.6 (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://100-dts-update-mt7622-rfb1.patch \
     file://101-dts-update-mt7629-rfb.patch \
     file://103-mt7623-enable-arch-timer.patch \
diff --git a/recipes-kernel/linux/linux-mediatek.inc b/recipes-kernel/linux/linux-mediatek.inc
index 43d1b3b..87e4816 100644
--- a/recipes-kernel/linux/linux-mediatek.inc
+++ b/recipes-kernel/linux/linux-mediatek.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Linux Kernel for Mediatek SoCs"
 SECTION = "kernel"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 COMPATIBLE_MACHINE = "^filogic$"
 
diff --git a/recipes-kernel/linux/linux-mediatek6-6.inc b/recipes-kernel/linux/linux-mediatek6-6.inc
index 341deec..9aa3c12 100644
--- a/recipes-kernel/linux/linux-mediatek6-6.inc
+++ b/recipes-kernel/linux/linux-mediatek6-6.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Linux Kernel for Mediatek SoCs"
 SECTION = "kernel"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 COMPATIBLE_MACHINE = "^filogic$"
 
diff --git a/recipes-kernel/linux/linux-mediatek_5.4.bb b/recipes-kernel/linux/linux-mediatek_5.4.bb
index 47c66eb..d491b7a 100644
--- a/recipes-kernel/linux/linux-mediatek_5.4.bb
+++ b/recipes-kernel/linux/linux-mediatek_5.4.bb
@@ -1,11 +1,11 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}/generic/backport-5.4:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}/generic/pending-5.4:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}/generic/hack-5.4:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}/mediatek/patches-5.4:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}/mediatek/flow_patch:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}/mediatek/nf_hnat:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}/mediatek/wed3:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}/generic/backport-5.4:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}/generic/pending-5.4:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}/generic/hack-5.4:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}/mediatek/patches-5.4:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}/mediatek/flow_patch:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}/mediatek/nf_hnat:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}/mediatek/wed3:"
 
 KBRANCH ?= "linux-5.4.y"
 
@@ -14,7 +14,7 @@
 KMETA = "kernel-meta"
 SRCREV_meta ?= "feeb59687bc0f054af837a5061f8d413ec7c93e9"
 
-DEPENDS_append = " kern-tools-native xz-native bc-native"
+DEPENDS:append = " kern-tools-native xz-native bc-native"
 
 SRC_URI = " \
     git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git;protocol=https;branch=${KBRANCH};name=machine \
@@ -27,21 +27,21 @@
     file://004-rdkb-hnat-bind-ifname.patch;apply=no \
     file://002-bpi_r4-lan0_as_wan.patch;apply=no \
     "
-SRC_URI_append_mt7988 += " \
+SRC_URI:append_mt7988 += " \
     file://mediatek/mt7988.cfg \
 "
-SRC_URI_append_mt7986 += " \
+SRC_URI:append_mt7986 += " \
     file://mediatek/mt7986.cfg \
 "
-SRC_URI_append_mt7987 += " \
+SRC_URI:append_mt7987 += " \
     file://mediatek/mt7987.cfg \
 "
-SRC_URI_append_mt7986-32bit += " \
+SRC_URI:append_mt7986-32bit += " \
     file://mediatek/patches-32bit-5.4/mt7986-32bit.cfg \
     file://mediatek/patches-32bit-5.4/401-pinctrl-add-mt7986-driver-32bit.patch \
     file://mediatek/patches-32bit-5.4/999-add_armv7_support_for_panther.patch \
 "
-SRC_URI_append += " \
+SRC_URI:append += " \
     file://rdkb_cfg/iptables.cfg \
     file://rdkb_cfg/turris_rdkb.cfg \
     file://rdkb_cfg/openvswitch.cfg \
@@ -58,21 +58,21 @@
 require ${PN}-${PV}/generic/backport-5.4/backport-5.4.inc
 
 require ${PN}-${PV}/generic/pending-5.4/pending-5.4.inc
-SRC_URI_remove = " \
+SRC_URI:remove = " \
     file://530-jffs2_make_lzma_available.patch \
     "
 require ${PN}-${PV}/generic/hack-5.4/hack-5.4.inc
-SRC_URI_remove = " \
+SRC_URI:remove = " \
     file://531-debloat_lzma.patch \
     "
 require ${PN}-${PV}/mediatek/patches-5.4/patches-5.4.inc
 
-SRC_URI_remove_mt7986-32bit = " \
+SRC_URI:remove_mt7986-32bit = " \
     file://999-2020-pinctrl-add-mt7986-driver.patch \
     "
 require linux-mediatek.inc
 
-do_patch_prepend () {
+do_patch:prepend () {
     cp -Rfp ${WORKDIR}/generic/files/* ${S}/
     cp -Rfp ${WORKDIR}/generic/files-5.4/* ${S}/
     cp -Rfp ${WORKDIR}/mediatek/files-5.4/* ${S}/
@@ -84,10 +84,6 @@
     DISTRO_logan_ENABLED="${@bb.utils.contains('DISTRO_FEATURES','logan','true','false',d)}"
     DISTRO_ccn34_build_ENABLED="${@bb.utils.contains('DISTRO_FEATURES','ccn34','true','false',d)}"
     DISTRO_LAN_AS_WAN_ENABLED="${@bb.utils.contains('DISTRO_FEATURES','lan0_as_wan','true','false',d)}"
-        if [ $DISTRO_ccn34_build_ENABLED = 'true' ]; then
-            rm -rf ${WORKDIR}/mediatek/nf_hnat/999-41*.patch
-            rm -rf ${WORKDIR}/mediatek/nf_hnat/999-45*.patch
-        fi
         if [ ! -e patch_applied ]; then
             patch -p1 < ${WORKDIR}/001-rdkb-eth-mtk-change-ifname-for.patch
             patch -p1 < ${WORKDIR}/003-rdkb-mtd-kernel-ubi-relayout.patch
@@ -112,7 +108,7 @@
             if [ $DISTRO_FlowBlock_ENABLED = 'true' ]; then
                 for i in ${WORKDIR}/mediatek/flow_patch/*.patch; do patch -p1 < $i; done
             fi
-            if [ $DISTRO_logan_ENABLED = 'true' ]; then
+            if [ $DISTRO_logan_ENABLED = 'true' ] ||[ $DISTRO_ccn34_build_ENABLED = 'true' ]; then
                 for i in ${WORKDIR}/mediatek/nf_hnat/*.patch; do patch -p1 < $i; done
                 patch -p1 < ${WORKDIR}/004-rdkb-hnat-bind-ifname.patch
             fi
diff --git a/recipes-kernel/linux/linux-mediatek_6.6.bb b/recipes-kernel/linux/linux-mediatek_6.6.bb
index 4bd980d..cf47e32 100644
--- a/recipes-kernel/linux/linux-mediatek_6.6.bb
+++ b/recipes-kernel/linux/linux-mediatek_6.6.bb
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}/generic/backport-6.6:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}/generic/pending-6.6:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}/generic/hack-6.6:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}/mediatek/patches-6.6:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}/mediatek/flow_patch:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}/generic/backport-6.6:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}/generic/pending-6.6:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}/generic/hack-6.6:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}/mediatek/patches-6.6:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}/mediatek/flow_patch:"
 
 KBRANCH ?= "linux-6.6.y"
 
@@ -12,7 +12,7 @@
 KMETA = "kernel-meta"
 SRCREV_meta ?= "dff911ce87fe7b9944c6058907f079ddb0f3e840"
 
-DEPENDS_append = " kern-tools-native xz-native bc-native"
+DEPENDS:append = " kern-tools-native xz-native bc-native"
 
 SRC_URI = " \
     git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git;protocol=https;branch=${KBRANCH};name=machine \
@@ -24,11 +24,11 @@
     file://004-rdkb-hnat-bind-ifname.patch;apply=no \
     file://003-rdkb-refactor-bpi-r4-dts.patch;apply=no \
     "
-SRC_URI_append_filogic += " \
+SRC_URI:append_filogic += " \
     file://mediatek/filogic.cfg \
 "
 
-SRC_URI_append += " \
+SRC_URI:append += " \
     file://rdkb_cfg/iptables.cfg \
     file://rdkb_cfg/turris_rdkb.cfg \
     file://rdkb_cfg/openvswitch.cfg \
@@ -45,11 +45,11 @@
 require ${PN}-${PV}/generic/backport-6.6/backport-6.6.inc
 
 require ${PN}-${PV}/generic/pending-6.6/pending-6.6.inc
-SRC_URI_remove = " \
+SRC_URI:remove = " \
     file://530-jffs2_make_lzma_available.patch \
     "
 require ${PN}-${PV}/generic/hack-6.6/hack-6.6.inc
-SRC_URI_remove = " \
+SRC_URI:remove = " \
     file://531-debloat_lzma.patch \
     "
 require ${PN}-${PV}/mediatek/patches-6.6/patches-6.6.inc
@@ -59,7 +59,7 @@
 
 export DTC_FLAGS = '-@'
 
-do_patch_prepend () {
+do_patch:prepend () {
     cp -Rfp ${WORKDIR}/generic/files/* ${S}/
 	cp -Rfp ${WORKDIR}/mediatek/files/* ${S}/
     cp -Rfp ${WORKDIR}/mediatek/files-6.6/* ${S}/
diff --git a/recipes-netsys/crypto-safexcel/crypto-safexcel.bb b/recipes-netsys/crypto-safexcel/crypto-safexcel.bb
index 4ae56fe..dd56c5c 100644
--- a/recipes-netsys/crypto-safexcel/crypto-safexcel.bb
+++ b/recipes-netsys/crypto-safexcel/crypto-safexcel.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Firmwares for EIP-197 Upstream Lookaside Driver"
-LICENSE = "GPL-2.0"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 SRC_URI = " \
@@ -21,4 +21,4 @@
 	install -m 0755 ${THISDIR}/files/src/firmware/ifpp.bin ${D}/${base_libdir}/firmware/inside-secure/eip197_minifw/
 }
 
-FILES_${PN} += "${base_libdir}/firmware/inside-secure/eip197_minifw/*"
+FILES:${PN} += "${base_libdir}/firmware/inside-secure/eip197_minifw/*"
diff --git a/recipes-netsys/crypto-safexcel/safexcel-insmod.bb b/recipes-netsys/crypto-safexcel/safexcel-insmod.bb
index 2dec63d..f1f7aa7 100644
--- a/recipes-netsys/crypto-safexcel/safexcel-insmod.bb
+++ b/recipes-netsys/crypto-safexcel/safexcel-insmod.bb
@@ -1,8 +1,8 @@
 SUMMARY = "Bringup scripts for EIP-197 Upstream Lookaside Driver"
-LICENSE = "GPL-2.0"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/init:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/init:"
 
 S = "${WORKDIR}/init"
 
@@ -11,10 +11,10 @@
 SRC_URI = "file://init"
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " safexcel_insmod.service"
-FILES_${PN} += "{systemd_unitdir}/system/safexcel_insmod.service"
+SYSTEMD_SERVICE:${PN} = " safexcel_insmod.service"
+FILES:${PN} += "{systemd_unitdir}/system/safexcel_insmod.service"
 
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
+SYSTEMD_AUTO_ENABLE:${PN} = "enable"
 
 do_install() {
 	install -d ${D}${sbindir}
diff --git a/recipes-netsys/eip-197/eip-197-insmod.bb b/recipes-netsys/eip-197/eip-197-insmod.bb
index 4da5b11..bc16346 100644
--- a/recipes-netsys/eip-197/eip-197-insmod.bb
+++ b/recipes-netsys/eip-197/eip-197-insmod.bb
@@ -1,8 +1,8 @@
 SUMMARY = "Bring up scripts for Mediatek EIP-197 Driver"
-LICENSE = "GPL-2.0"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/init:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/init:"
 
 S = "${WORKDIR}/init"
 
@@ -11,10 +11,10 @@
 SRC_URI = "file://init"
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " eip-197_insmod.service"
-FILES_${PN} += "{systemd_unitdir}/system/eip-197_insmod.service"
+SYSTEMD_SERVICE:${PN} = " eip-197_insmod.service"
+FILES:${PN} += "{systemd_unitdir}/system/eip-197_insmod.service"
 
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
+SYSTEMD_AUTO_ENABLE:${PN} = "enable"
 
 do_install() {
 	install -d ${D}${sbindir}
diff --git a/recipes-netsys/eip-197/eip-197.bb b/recipes-netsys/eip-197/eip-197.bb
index 56feda1..4619cf9 100644
--- a/recipes-netsys/eip-197/eip-197.bb
+++ b/recipes-netsys/eip-197/eip-197.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Mediatek EIP-197 Driver"
-LICENSE = "GPL-2.0"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 inherit module
@@ -86,7 +86,7 @@
 	modules \
 	"
 
-do_install_append() {
+do_install:append() {
 	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra/
 	install -m 0755 ${S}/crypto-eip-inline.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/
 	install -m 0755 ${S}/ddk/build/ksupport/crypto-eip-ddk-ksupport.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/
@@ -101,4 +101,4 @@
 	install -m 0755 ${S}/../firmware/bin/firmware_eip207_opue.bin ${D}/${base_libdir}/firmware/
 }
 
-FILES_${PN} += "${base_libdir}/firmware/*"
+FILES:${PN} += "${base_libdir}/firmware/*"
diff --git a/recipes-netsys/pce/pce-insmod.bb b/recipes-netsys/pce/pce-insmod.bb
index aae8c60..8ea93cb 100644
--- a/recipes-netsys/pce/pce-insmod.bb
+++ b/recipes-netsys/pce/pce-insmod.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Bring up scripts for Mediatek PCE Driver"
-LICENSE = "GPL-2.0"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 inherit systemd
@@ -9,10 +9,10 @@
 S = "${WORKDIR}/init"
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "pce_insmod.service"
-FILES_${PN} += "{systemd_unitdir}/system/pce_insmod.service"
+SYSTEMD_SERVICE:${PN} = "pce_insmod.service"
+FILES:${PN} += "{systemd_unitdir}/system/pce_insmod.service"
 
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
+SYSTEMD_AUTO_ENABLE:${PN} = "enable"
 
 do_install() {
 	install -d ${D}${sbindir}/
diff --git a/recipes-netsys/pce/pce.bb b/recipes-netsys/pce/pce.bb
index 40d2065..7464a4e 100644
--- a/recipes-netsys/pce/pce.bb
+++ b/recipes-netsys/pce/pce.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Mediatek PCE Driver"
-LICENSE = "GPL-2.0"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 inherit module
@@ -31,7 +31,7 @@
 MAKE_TARGETS = "modules"
 do_make_scripts[depends] += "virtual/kernel:do_shared_workdir"
 
-do_install_append() {
+do_install:append() {
 	# Install header files for depedency modules
 	cp -r ${S}/inc/pce ${STAGING_KERNEL_BUILDDIR}/source/include
 
diff --git a/recipes-wifi/atenl/atenl.bb b/recipes-wifi/atenl/atenl.bb
index 82906af..c8aabdf 100644
--- a/recipes-wifi/atenl/atenl.bb
+++ b/recipes-wifi/atenl/atenl.bb
@@ -1,38 +1,38 @@
-DESCRIPTION = "testmode daemon for nl80211"

-SECTION = "applications"

-LICENSE = "GPLv2"

-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"

-

-DEPENDS += "libnl-tiny util-linux "

-RDEPENDS_${PN} += "bash"

-inherit pkgconfig cmake

-

-SRC_URI = " \

-    file://COPYING;subdir=git/src \

-    file://src;subdir=git \

-    file://ated.sh;subdir=git \

-    file://iwpriv.sh;subdir=git \

-    file://001-RDKB-ash-to-bash.patch;apply=no \

-    "

-

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

-

-CFLAGS_append = " -I=${includedir}/libnl-tiny "

-

-do_mtk_patches() {

-	cd ${S}/../

-    

-	if [ ! -e mtk_wifi_patch_applied ]; then

-        patch -p1 < ${WORKDIR}/001-RDKB-ash-to-bash.patch

-	fi

-	touch mtk_wifi_patch_applied

-}

-addtask mtk_patches after do_patch before do_configure

-

-do_install_append() {

-    install -d ${D}${sbindir}

-    install -m 0755 ${WORKDIR}/git/ated.sh ${D}${sbindir}/ated

-    install -m 0755 ${WORKDIR}/git/iwpriv.sh ${D}${sbindir}/iwpriv

-    install -m 0755 ${WORKDIR}/git/iwpriv.sh ${D}${sbindir}/mwctl

-}

-

+DESCRIPTION = "testmode daemon for nl80211"
+SECTION = "applications"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS += "libnl-tiny util-linux "
+RDEPENDS_${PN} += "bash"
+inherit pkgconfig cmake
+
+SRC_URI = " \
+    file://COPYING;subdir=git/src \
+    file://src;subdir=git \
+    file://ated.sh;subdir=git \
+    file://iwpriv.sh;subdir=git \
+    file://001-RDKB-ash-to-bash.patch;apply=no \
+    "
+
+S = "${WORKDIR}/git/src"
+
+CFLAGS:append = " -I=${includedir}/libnl-tiny "
+
+do_mtk_patches() {
+	cd ${S}/../
+    
+	if [ ! -e mtk_wifi_patch_applied ]; then
+        patch -p1 < ${WORKDIR}/001-RDKB-ash-to-bash.patch
+	fi
+	touch mtk_wifi_patch_applied
+}
+addtask mtk_patches after do_patch before do_configure
+
+do_install:append() {
+    install -d ${D}${sbindir}
+    install -m 0755 ${WORKDIR}/git/ated.sh ${D}${sbindir}/ated
+    install -m 0755 ${WORKDIR}/git/iwpriv.sh ${D}${sbindir}/iwpriv
+    install -m 0755 ${WORKDIR}/git/iwpriv.sh ${D}${sbindir}/mwctl
+}
+
diff --git a/recipes-wifi/ccsp/ccsp-wifi-agent.bbappend b/recipes-wifi/ccsp/ccsp-wifi-agent.bbappend
index 6cbe7d1..bebc22a 100644
--- a/recipes-wifi/ccsp/ccsp-wifi-agent.bbappend
+++ b/recipes-wifi/ccsp/ccsp-wifi-agent.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_append := "${THISDIR}/files:"
+FILESEXTRAPATHS:append := "${THISDIR}/files:"
 
-CFLAGS_append += " -DWIFI_HAL_VERSION_3 -DCONFIG_DFS -D_WIFI_AX_SUPPORT_ -D_PLATFORM_TURRIS_ "
+CFLAGS:append += " -DWIFI_HAL_VERSION_3 -DCONFIG_DFS -D_WIFI_AX_SUPPORT_ -D_PLATFORM_TURRIS_ "
 
-SRC_URI_append += " \
+SRC_URI:append += " \
     file://Fix-dmcli-can-not-set-password.patch;apply=no \
 "
 
diff --git a/recipes-wifi/hal/hal-wifi-mt76.bb b/recipes-wifi/hal/hal-wifi-mt76.bb
index 4a1f0bf..f66d5d4 100644
--- a/recipes-wifi/hal/hal-wifi-mt76.bb
+++ b/recipes-wifi/hal/hal-wifi-mt76.bb
@@ -3,12 +3,12 @@
 LIC_FILES_CHKSUM = "file://../../LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
 
 PROVIDES = "hal-wifi"
-RPROVIDES_${PN} = "hal-wifi"
+RPROVIDES:${PN} = "hal-wifi"
 SRCREV = "${AUTOREV}"
 
 inherit autotools coverity
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI = "git://gerrit.mediatek.inc/gateway/rdk-b/rdkb_hal;protocol=https;branch=master;destsuffix=git/ \
         file://LICENSE;subdir=git \
@@ -20,11 +20,11 @@
 S = "${WORKDIR}/git/src/wifi/"
 
 DEPENDS += "halinterface libnl libev hostapd wpa-supplicant"
-CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'extender', '-D_TURRIS_EXTENDER_', '', d)}"
-CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wifi_eht', '-DSINGLE_WIPHY_SUPPORT', '', d)}"
-CFLAGS_append = " -I=${includedir}/ccsp -I=${includedir}/libnl3"
-CFLAGS_append = " -DWIFI_HAL_VERSION_3 -DDYNAMIC_IF_NAME"
-LDFLAGS_append = " -lnl-nf-3 -lnl-route-3 -lnl-3 -lnl-xfrm-3 -lnl-genl-3 -lev -lwpa_client -lpthread"
+CFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'extender', '-D_TURRIS_EXTENDER_', '', d)}"
+CFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wifi_eht', '-DSINGLE_WIPHY_SUPPORT', '', d)}"
+CFLAGS:append = " -I=${includedir}/ccsp -I=${includedir}/libnl3"
+CFLAGS:append = " -DWIFI_HAL_VERSION_3 -DDYNAMIC_IF_NAME"
+LDFLAGS:append = " -lnl-nf-3 -lnl-route-3 -lnl-3 -lnl-xfrm-3 -lnl-genl-3 -lev -lwpa_client -lpthread"
 
-RDEPENDS_${PN}_dunfell += " wpa-supplicant"
-RDEPENDS_${PN} += "wpa-supplicant"
+RDEPENDS:${PN}_dunfell += " wpa-supplicant"
+RDEPENDS:${PN} += "wpa-supplicant"
diff --git a/recipes-wifi/hal/halinterface.bbappend b/recipes-wifi/hal/halinterface.bbappend
index 8af71a8..b2169d7 100644
--- a/recipes-wifi/hal/halinterface.bbappend
+++ b/recipes-wifi/hal/halinterface.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append = " \
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI:append = " \
         file://sta-network.patch;apply=no \
         file://add_undefined_dfs_function.patch;apply=no \
         file://0001-Add-owe-mode.patch;apply=no \
@@ -31,4 +31,4 @@
 }
 addtask filogic_patches after do_unpack before do_compile
 
-CFLAGS_append = " -DWIFI_HAL_VERSION_3"
+CFLAGS:append = " -DWIFI_HAL_VERSION_3"
diff --git a/recipes-wifi/hostapd/files/kernel6-6-patches/patches.inc b/recipes-wifi/hostapd/files/kernel6-6-patches/patches.inc
index 47eb78d..047a201 100644
--- a/recipes-wifi/hostapd/files/kernel6-6-patches/patches.inc
+++ b/recipes-wifi/hostapd/files/kernel6-6-patches/patches.inc
@@ -1,5 +1,5 @@
 #patch patches (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-step-to-hostapd-2025-02-15-version.patch \
     file://0002-sync-2025-02-12-openwrt-src-folder.patch \
     file://0003-sync-2025-02-12-openwrt-patches-folder.patch \
diff --git a/recipes-wifi/hostapd/files/patches-2.11/patches.inc b/recipes-wifi/hostapd/files/patches-2.11/patches.inc
index 9cfa81e..f8c8e79 100644
--- a/recipes-wifi/hostapd/files/patches-2.11/patches.inc
+++ b/recipes-wifi/hostapd/files/patches-2.11/patches.inc
@@ -1,5 +1,5 @@
 #patch patches (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-sync-2024-10-02-openwrt-src-folder.patch \
     file://0002-sync-2024-10-02-openwrt-patches-folder.patch \
     file://0003-hostapd-afcd-add-AFC-daemon-support.patch \
diff --git a/recipes-wifi/hostapd/files/patches/patches.inc b/recipes-wifi/hostapd/files/patches/patches.inc
index 3bf4d7e..03066f8 100644
--- a/recipes-wifi/hostapd/files/patches/patches.inc
+++ b/recipes-wifi/hostapd/files/patches/patches.inc
@@ -1,5 +1,5 @@
 #patch patches (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://001-wolfssl-init-RNG-with-ECC-key.patch \
     file://010-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch \
     file://011-mesh-use-deterministic-channel-on-channel-switch.patch \
diff --git a/recipes-wifi/hostapd/hostapd_2.10.bb b/recipes-wifi/hostapd/hostapd_2.10.bb
index e83d34e..215783b 100644
--- a/recipes-wifi/hostapd/hostapd_2.10.bb
+++ b/recipes-wifi/hostapd/hostapd_2.10.bb
@@ -5,12 +5,12 @@
 LIC_FILES_CHKSUM = "file://hostapd/README;md5=c905478466c90f1cefc0df987c40e172"
 
 DEPENDS = "libnl openssl ubus"
-DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'telemetry2_0', 'telemetry', '', d)}"
-LDFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'telemetry2_0', ' -ltelemetry_msgsender ', '', d)}"
-RDEPENDS_${PN} += "gawk"
+DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'telemetry2_0', 'telemetry', '', d)}"
+LDFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'telemetry2_0', ' -ltelemetry_msgsender ', '', d)}"
+RDEPENDS:${PN} += "gawk"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/patches:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/patches:"
 
 SRCREV ?= "b704dc72ef824dfdd96674b90179b274d1d38105"
 SRC_URI = " \
@@ -36,11 +36,11 @@
 inherit update-rc.d systemd pkgconfig features_check
 INITSCRIPT_NAME = "hostapd"
 
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-SYSTEMD_SERVICE_${PN} = "hostapd.service"
-SYSTEMD_SERVICE_${PN} += " init-uci-config.service"
+SYSTEMD_AUTO_ENABLE:${PN} = "enable"
+SYSTEMD_SERVICE:${PN} = "hostapd.service"
+SYSTEMD_SERVICE:${PN} += " init-uci-config.service"
 
-do_unpack_append() {
+do_unpack:append() {
     bb.build.exec_func('do_copy_openwrt_src', d)
 }
 
@@ -48,7 +48,7 @@
     cp -Rfp ${WORKDIR}/src/* ${S}/
 }
 
-do_configure_append() {
+do_configure:append() {
     install -m 0644 ${WORKDIR}/hostapd-full.config ${B}/.config
 
     echo "CONFIG_MBO=y" >> ${B}/.config
@@ -101,7 +101,7 @@
          install -m 0755 ${WORKDIR}/mac80211.sh ${D}${sbindir}
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
                 ${systemd_unitdir}/system/hostapd.service \
                 ${sysconfdir}/hostapd-2G.conf \
                 ${sysconfdir}/hostapd-5G.conf \
diff --git a/recipes-wifi/hostapd/hostapd_2.11.bb b/recipes-wifi/hostapd/hostapd_2.11.bb
index 889a23a..16003a2 100644
--- a/recipes-wifi/hostapd/hostapd_2.11.bb
+++ b/recipes-wifi/hostapd/hostapd_2.11.bb
@@ -5,15 +5,15 @@
 LIC_FILES_CHKSUM = "file://hostapd/README;md5=0e430ef1be3d6eebf257cf493fc7661d"
 
 DEPENDS = "libnl-tiny openssl ubus ucode udebug"
-DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'telemetry2_0', 'telemetry', '', d)}"
-LDFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'telemetry2_0', ' -ltelemetry_msgsender ', '', d)}"
-RDEPENDS_${PN} += "gawk ucode udebug"
+DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'telemetry2_0', 'telemetry', '', d)}"
+LDFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'telemetry2_0', ' -ltelemetry_msgsender ', '', d)}"
+RDEPENDS:${PN} += "gawk ucode udebug"
 
 PATCH_SRC = "${@bb.utils.contains('DISTRO_FEATURES', 'kernel6-6', 'kernel6-6-patches', 'patches-${PV}', d)}"
 UC_SRC = "${@bb.utils.contains('DISTRO_FEATURES', 'kernel6-6', 'kernel6-6-uc-files', 'uc-files', d)}"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/${PATCH_SRC}:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/${UC_SRC}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/${PATCH_SRC}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/${UC_SRC}:"
 
 SRCREV ?= "96e48a05aa0a82e91e3cab75506297e433e253d0"
 
@@ -47,13 +47,13 @@
 inherit update-rc.d systemd pkgconfig features_check
 INITSCRIPT_NAME = "hostapd"
 
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-SYSTEMD_SERVICE_${PN} = "hostapd.service"
-SYSTEMD_SERVICE_${PN} += " init-uci-config.service"
-INSANE_SKIP_${PN} += "file-rdeps"
+SYSTEMD_AUTO_ENABLE:${PN} = "enable"
+SYSTEMD_SERVICE:${PN} = "hostapd.service"
+SYSTEMD_SERVICE:${PN} += " init-uci-config.service"
+INSANE_SKIP:${PN} += "file-rdeps"
 
 
-do_configure_append() {
+do_configure:append() {
     install -m 0644 ${WORKDIR}/hostapd-full.config ${B}/.config
 
     echo "CONFIG_MBO=y" >> ${B}/.config
@@ -124,7 +124,7 @@
          install -m 0755 ${WORKDIR}/mac80211.uc ${D}${datadir}/hostap
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
                 ${systemd_unitdir}/system/hostapd.service \
                 ${sysconfdir}/hostapd-2G-EHT.conf \
                 ${sysconfdir}/hostapd-5G-EHT.conf \
diff --git a/recipes-wifi/iw/iw_6.9.bb b/recipes-wifi/iw/iw_6.9.bb
index fb95959..d13f7ca 100644
--- a/recipes-wifi/iw/iw_6.9.bb
+++ b/recipes-wifi/iw/iw_6.9.bb
@@ -18,11 +18,11 @@
 
 PATCH_SRC = "${@bb.utils.contains('DISTRO_FEATURES', 'wifi_eht', 'patches-mlo', 'patches', d)}"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PATCH_SRC}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PATCH_SRC}:"
 require ${PATCH_SRC}/patches.inc
 
-SRC_URI_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'wifi_eht', 'file://001-nl80211_h_sync.patch', '', d)}"
-SRC_URI_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'wifi_eht', 'file://120-antenna_gain.patch', '', d)}"
+SRC_URI:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'wifi_eht', 'file://001-nl80211_h_sync.patch', '', d)}"
+SRC_URI:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'wifi_eht', 'file://120-antenna_gain.patch', '', d)}"
 
 inherit pkgconfig
 
diff --git a/recipes-wifi/iw/patches-mlo/patches.inc b/recipes-wifi/iw/patches-mlo/patches.inc
index 5f7863b..400a361 100644
--- a/recipes-wifi/iw/patches-mlo/patches.inc
+++ b/recipes-wifi/iw/patches-mlo/patches.inc
@@ -1,5 +1,5 @@
 #patch patches (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-iw-refactor-frequency-help.patch \
     file://0002-iw-add-puncturing-support.patch \
     file://0003-util-clarify-comment-about-parsed-pointer.patch \
diff --git a/recipes-wifi/iw/patches/patches.inc b/recipes-wifi/iw/patches/patches.inc
index b457841..70ffc14 100644
--- a/recipes-wifi/iw/patches/patches.inc
+++ b/recipes-wifi/iw/patches/patches.inc
@@ -1,5 +1,5 @@
 #patch patches (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://001-nl80211_h_sync.patch \
     file://010-Revert-iw-allow-specifying-CFLAGS-LIBS-externally.patch \
     file://1000-Add-support-for-5G-U-NII-3-6G-BW320.patch \
diff --git a/recipes-wifi/iwinfo/iwinfo_git.bb b/recipes-wifi/iwinfo/iwinfo_git.bb
index c183590..65972a6 100644
--- a/recipes-wifi/iwinfo/iwinfo_git.bb
+++ b/recipes-wifi/iwinfo/iwinfo_git.bb
@@ -36,4 +36,4 @@
 }
 
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/libiwinfo.so ${libdir}/lua/iwinfo.so"
+FILES:${PN} += "${libdir}/libiwinfo.so ${libdir}/lua/iwinfo.so"
diff --git a/recipes-wifi/json-c/json-c_0.15.bb b/recipes-wifi/json-c/json-c_0.15.bb
index 04a7892..b5ec08e 100644
--- a/recipes-wifi/json-c/json-c_0.15.bb
+++ b/recipes-wifi/json-c/json-c_0.15.bb
@@ -12,7 +12,7 @@
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+)-\d+"
 
-RPROVIDES_${PN} = "libjson"
+RPROVIDES:${PN} = "libjson"
 
 inherit cmake
 
diff --git a/recipes-wifi/libnl-tiny/libnl-tiny_git.bb b/recipes-wifi/libnl-tiny/libnl-tiny_git.bb
index f075062..e43b032 100644
--- a/recipes-wifi/libnl-tiny/libnl-tiny_git.bb
+++ b/recipes-wifi/libnl-tiny/libnl-tiny_git.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "This package contains a stripped down version of libnl"
 HOMEPAGE = "https://git.openwrt.org/?p=project/libnl-tiny.git;a=summary"
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://nl.c;startline=4;endline=7;md5=f16bd5d25e622bb3001bab76be1f9f91"
 SECTION = "libs"
 
-SRC_URI = "git://git.openwrt.org/project/libnl-tiny.git"
+SRC_URI = "git://git.openwrt.org/project/libnl-tiny.git;branch=master"
 SRCREV = "965c4bf49658342ced0bd6e7cb069571b4a1ddff"
 SRCREV_kernel6-6 = "c0df580adbd4d555ecc1962dbe88e91d75b67a4e"
 
@@ -14,5 +14,5 @@
 S = "${WORKDIR}/git"
 
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/*.so"
-INSANE_SKIP_${PN} += "dev-so"
\ No newline at end of file
+FILES:${PN} += "${libdir}/*.so"
+INSANE_SKIP:${PN} += "dev-so"
\ No newline at end of file
diff --git a/recipes-wifi/libubox/libubox_git.bbappend b/recipes-wifi/libubox/libubox_git.bbappend
index 2422b30..9c8f1f1 100644
--- a/recipes-wifi/libubox/libubox_git.bbappend
+++ b/recipes-wifi/libubox/libubox_git.bbappend
@@ -1,4 +1,4 @@
-SRC_URI_remove = "file://0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch"
+SRC_URI:remove = "file://0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch"
 
 wifi6_ver = "b14c4688612c05c78ce984d7bde633bce8703b1e"
 wifi7_ver = "eb9bcb64185ac155c02cc1a604692c4b00368324"
diff --git a/recipes-wifi/linux-mac80211/files/kernel6-6-patches/subsys/subsys.inc b/recipes-wifi/linux-mac80211/files/kernel6-6-patches/subsys/subsys.inc
index deaf0ee..3354e9b 100644
--- a/recipes-wifi/linux-mac80211/files/kernel6-6-patches/subsys/subsys.inc
+++ b/recipes-wifi/linux-mac80211/files/kernel6-6-patches/subsys/subsys.inc
@@ -1,5 +1,5 @@
 #patch subsys (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-step-to-wireless-next-2025-01-17-tag.patch \
     file://0002-sync-patches-build.patch \
     file://0003-sync-patches-subsys.patch \
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/subsys.inc b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/subsys.inc
index fc5dda5..da3874b 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/subsys.inc
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/subsys.inc
@@ -1,5 +1,5 @@
 #patch subsys (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0000-step-to-wireless-next-2024-10-25-tag.patch \
     file://0001-sync-patches-build.patch \
     file://0002-sync-patches-subsys.patch \
diff --git a/recipes-wifi/linux-mac80211/files/patches/build/build.inc b/recipes-wifi/linux-mac80211/files/patches/build/build.inc
index a50f5cd..55970cb 100644
--- a/recipes-wifi/linux-mac80211/files/patches/build/build.inc
+++ b/recipes-wifi/linux-mac80211/files/patches/build/build.inc
@@ -1,5 +1,5 @@
 #patch build (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://000-fix_kconfig.patch \
     file://001-fix_build.patch \
     file://002-change_allconfig.patch \
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/subsys.inc b/recipes-wifi/linux-mac80211/files/patches/subsys/subsys.inc
index 26aea23..fb9bcbd 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/subsys.inc
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/subsys.inc
@@ -1,5 +1,5 @@
 #patch subsys (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://110-mac80211_keep_keys_on_stop_ap.patch \
     file://120-cfg80211_allow_perm_addr_change.patch \
     file://150-disable_addr_notifier.patch \
diff --git a/recipes-wifi/linux-mac80211/linux-mac80211_5.15.%.bb b/recipes-wifi/linux-mac80211/linux-mac80211_5.15.%.bb
index 14891ba..612eda2 100644
--- a/recipes-wifi/linux-mac80211/linux-mac80211_5.15.%.bb
+++ b/recipes-wifi/linux-mac80211/linux-mac80211_5.15.%.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux backports"
 HOMEPAGE = "https://backports.wiki.kernel.org"
 SECTION = "kernel/modules"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 inherit module
@@ -18,15 +18,15 @@
 DEPENDS += "virtual/kernel"
 DEPENDS += "bison-native coreutils-native flex-native"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/patches/build:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/patches/subsys:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/patches/build:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/patches/subsys:"
 
 require files/patches/build/build.inc
 require files/patches/subsys/subsys.inc
 
-SRC_URI_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'flow_offload', '', 'file://mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch', d)}"
-SRC_URI_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'flow_offload', '', 'file://mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch', d)}"
-SRC_URI_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'flow_offload', '', 'file://mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch', d)}"
+SRC_URI:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'flow_offload', '', 'file://mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch', d)}"
+SRC_URI:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'flow_offload', '', 'file://mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch', d)}"
+SRC_URI:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'flow_offload', '', 'file://mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch', d)}"
 
 S = "${WORKDIR}/backports-${PV}-1"
 
@@ -52,7 +52,7 @@
     oe_runmake allnoconfig
 }
 
-do_install_prepend () {
+do_install:prepend () {
     mkdir -p \
 	${STAGING_KERNEL_BUILDDIR}/usr/include/mac80211 \
 	${STAGING_KERNEL_BUILDDIR}/usr/include/mac80211-backport \
@@ -65,7 +65,7 @@
     rm -f ${STAGING_KERNEL_BUILDDIR}/usr/include/mac80211-backport/linux/module.h
 }
 
-do_install_append() {
+do_install:append() {
     # Module
     cat ${D}/usr/include/linux-mac80211/Module.symvers >> ${TMPDIR}/work-shared/${MACHINE}/kernel-build-artifacts/Module.symvers
 }
diff --git a/recipes-wifi/linux-mac80211/linux-mac80211_6.%.bb b/recipes-wifi/linux-mac80211/linux-mac80211_6.%.bb
index 62a2db3..35bff70 100644
--- a/recipes-wifi/linux-mac80211/linux-mac80211_6.%.bb
+++ b/recipes-wifi/linux-mac80211/linux-mac80211_6.%.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux backports"
 HOMEPAGE = "https://backports.wiki.kernel.org"
 SECTION = "kernel/modules"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 inherit module
@@ -22,7 +22,7 @@
 DEPENDS += "bison-native coreutils-native flex-native"
 PATCH_SRC = "${@bb.utils.contains('DISTRO_FEATURES', 'kernel6-6', 'kernel6-6-patches', 'patches-6.x', d)}"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/${PATCH_SRC}/subsys:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/${PATCH_SRC}/subsys:"
 
 require files/${PATCH_SRC}/subsys/subsys.inc
 
@@ -50,7 +50,7 @@
     oe_runmake allnoconfig
 }
 
-do_install_prepend () {
+do_install:prepend () {
     mkdir -p \
 	${STAGING_KERNEL_BUILDDIR}/usr/include/mac80211 \
 	${STAGING_KERNEL_BUILDDIR}/usr/include/mac80211-backport \
@@ -63,7 +63,7 @@
     rm -f ${STAGING_KERNEL_BUILDDIR}/usr/include/mac80211-backport/linux/module.h
 }
 
-do_install_append() {
+do_install:append() {
     # Module
     cat ${D}/usr/include/linux-mac80211/Module.symvers >> ${TMPDIR}/work-shared/${MACHINE}/kernel-build-artifacts/Module.symvers
 }
diff --git a/recipes-wifi/linux-mt76/files/kernel6-6-patches/patches.inc b/recipes-wifi/linux-mt76/files/kernel6-6-patches/patches.inc
index f8d5404..caed058 100644
--- a/recipes-wifi/linux-mt76/files/kernel6-6-patches/patches.inc
+++ b/recipes-wifi/linux-mt76/files/kernel6-6-patches/patches.inc
@@ -1,5 +1,5 @@
 #patch patches (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-mtk-mt76-mt7996-update-callback-to-.link_sta_rc_upda.patch \
     file://0002-mtk-mt76-mt7990-add-a-macro-to-represent-decive-id.patch \
     file://0003-mtk-mt76-mt7996-remove-mt7996_mac_enable_rtscts.patch \
diff --git a/recipes-wifi/linux-mt76/files/patches-3.x/patches.inc b/recipes-wifi/linux-mt76/files/patches-3.x/patches.inc
index c4de599..1e1744e 100644
--- a/recipes-wifi/linux-mt76/files/patches-3.x/patches.inc
+++ b/recipes-wifi/linux-mt76/files/patches-3.x/patches.inc
@@ -1,5 +1,5 @@
 #patch patches (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-wifi-mt76-add-support-for-allocating-a-phy-without-h.patch \
     file://0002-mtk-mt76-mt7996-update-callback-to-.link_sta_rc_upda.patch \
     file://0003-mtk-mt76-mt7996-add-max-mpdu-len-capability.patch \
diff --git a/recipes-wifi/linux-mt76/files/patches/patches.inc b/recipes-wifi/linux-mt76/files/patches/patches.inc
index f9dbcbd..00747e5 100644
--- a/recipes-wifi/linux-mt76/files/patches/patches.inc
+++ b/recipes-wifi/linux-mt76/files/patches/patches.inc
@@ -1,5 +1,5 @@
 #patch patches (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-wifi-mt76-fix-incorrect-HE-TX-GI-report.patch \
     file://0002-wifi-mt76-mt7915-add-pc-stack-dump-for-WM-s-coredump.patch \
     file://0003-wifi-mt76-mt7915-move-temperature-margin-check-to-mt.patch \
diff --git a/recipes-wifi/linux-mt76/linux-mt76_2.x.bb b/recipes-wifi/linux-mt76/linux-mt76_2.x.bb
index b62aac1..15bbfa7 100644
--- a/recipes-wifi/linux-mt76/linux-mt76_2.x.bb
+++ b/recipes-wifi/linux-mt76/linux-mt76_2.x.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Mediatek Wireless Drivers"
 SECTION = "kernel/modules"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c188eeeb69c0a05d0545816f1458a0c9"
 
 inherit module
@@ -19,12 +19,12 @@
 DEPENDS += "virtual/kernel"
 DEPENDS += "linux-mac80211"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/patches:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/src:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/patches:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/src:"
 
 require files/patches/patches.inc
-SRC_URI_append += "file://5000-mt76-add-internal-wed_tiny-header-file.patch"
-SRC_URI_append += "file://5001-mt76-mt7915-disable-wed.patch"
+SRC_URI:append += "file://5000-mt76-add-internal-wed_tiny-header-file.patch"
+SRC_URI:append += "file://5001-mt76-mt7915-disable-wed.patch"
 
 S = "${WORKDIR}/git"
 
@@ -77,7 +77,7 @@
     install -m 0644 ${B}/mt7915/mt7915e.ko ${D}/lib/modules/${KERNEL_VERSION}/updates/drivers/net/wireless/mediatek/mt76/mt7915/
 }
 
-do_install_append () {
+do_install:append () {
     install -d ${D}/${base_libdir}/firmware/mediatek/
 
     install -m 644 ${WORKDIR}/src/firmware/mt7915_rom_patch.bin ${D}${base_libdir}/firmware/mediatek/
@@ -92,7 +92,7 @@
     install -m 644 ${WORKDIR}/src/firmware/mt7916_eeprom.bin ${D}${base_libdir}/firmware/mediatek/
 }
 
-do_install_append_mt7986 () {
+do_install:append_mt7986 () {
     install -d ${D}/${base_libdir}/firmware/mediatek/
 
     install -m 644 ${WORKDIR}/src/firmware/mt7986_rom_patch.bin ${D}${base_libdir}/firmware/mediatek/
@@ -108,15 +108,15 @@
     install -m 644 ${WORKDIR}/src/firmware/mt7986_wo_1.bin ${D}${base_libdir}/firmware/mediatek/
 }
 
-FILES_${PN} += "${base_libdir}/firmware/mediatek/*"
+FILES:${PN} += "${base_libdir}/firmware/mediatek/*"
 
 # Make linux-mt76 depend on all of the split-out packages.
-python populate_packages_prepend () {
+python populate_packages:prepend () {
     firmware_pkgs = oe.utils.packages_filter_out_system(d)
-    d.appendVar('RDEPENDS_linux-mt76', ' ' + ' '.join(firmware_pkgs))
+    d.appendVar('RDEPENDS:linux-mt76', ' ' + ' '.join(firmware_pkgs))
 }
 
-#RPROVIDES_${PN} += "kernel-module-${PN}-${KERNEL_VERSION}"
-#RPROVIDES_${PN} += "kernel-module-${PN}-connac-lib-${KERNEL_VERSION}"
+#RPROVIDES:${PN} += "kernel-module-${PN}-${KERNEL_VERSION}"
+#RPROVIDES:${PN} += "kernel-module-${PN}-connac-lib-${KERNEL_VERSION}"
 
 KERNEL_MODULE_AUTOLOAD += "mt7915e"
diff --git a/recipes-wifi/linux-mt76/linux-mt76_3.x.bb b/recipes-wifi/linux-mt76/linux-mt76_3.x.bb
index 887f0fe..4a5c6b5 100644
--- a/recipes-wifi/linux-mt76/linux-mt76_3.x.bb
+++ b/recipes-wifi/linux-mt76/linux-mt76_3.x.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Mediatek Wireless Drivers"
 SECTION = "kernel/modules"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c188eeeb69c0a05d0545816f1458a0c9"
 
 inherit module
@@ -21,8 +21,8 @@
     file://${FW_SRC} \
     "
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/${PATCH_SRC}:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${FW_SRC}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/${PATCH_SRC}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${FW_SRC}:"
 
 require files/${PATCH_SRC}/patches.inc
 
@@ -75,7 +75,7 @@
     install -m 0644 ${B}/mt7996/mt7996e.ko ${D}/lib/modules/${KERNEL_VERSION}/updates/drivers/net/wireless/mediatek/mt76/
 }
 
-do_install_append () {
+do_install:append () {
     install -d ${D}/${base_libdir}/firmware/mediatek/mt7996
     IS_MT7996="${@bb.utils.contains('DISTRO_FEATURES','mt7996','true','false',d)}"
     IS_MT7992="${@bb.utils.contains('DISTRO_FEATURES','mt7992','true','false',d)}"
@@ -93,7 +93,7 @@
     fi
 }
 
-do_install_append_mt7988 () {
+do_install:append_mt7988 () {
     IS_KERNEL_V6="${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','true','false',d)}"
     if [ $IS_KERNEL_V6 = 'false' ]; then
         install -d ${D}/${base_libdir}/firmware/mediatek/
@@ -104,15 +104,15 @@
     fi
 }
 
-FILES_${PN} += "${base_libdir}/firmware/mediatek/*"
+FILES:${PN} += "${base_libdir}/firmware/mediatek/*"
 
 # Make linux-mt76 depend on all of the split-out packages.
-python populate_packages_prepend () {
+python populate_packages:prepend () {
     firmware_pkgs = oe.utils.packages_filter_out_system(d)
-    d.appendVar('RDEPENDS_linux-mt76', ' ' + ' '.join(firmware_pkgs))
+    d.appendVar('RDEPENDS:linux-mt76', ' ' + ' '.join(firmware_pkgs))
 }
 
-#RPROVIDES_${PN} += "kernel-module-${PN}-${KERNEL_VERSION}"
-#RPROVIDES_${PN} += "kernel-module-${PN}-connac-lib-${KERNEL_VERSION}"
+#RPROVIDES:${PN} += "kernel-module-${PN}-${KERNEL_VERSION}"
+#RPROVIDES:${PN} += "kernel-module-${PN}-connac-lib-${KERNEL_VERSION}"
 
 KERNEL_MODULE_AUTOLOAD += "mt7996e"
diff --git a/recipes-wifi/linux-mt76/mt76-test.bb b/recipes-wifi/linux-mt76/mt76-test.bb
index ecd374f..3fefd22 100644
--- a/recipes-wifi/linux-mt76/mt76-test.bb
+++ b/recipes-wifi/linux-mt76/mt76-test.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "mt76-test"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=c188eeeb69c0a05d0545816f1458a0c9"
 
 DEPENDS += "libnl-tiny linux-mac80211"
@@ -24,10 +24,10 @@
 DEPENDS += "linux-mac80211"
 DEPENDS += "linux-mt76"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 
-CFLAGS_append = " -I=${includedir}/libnl-tiny -I${STAGING_KERNEL_BUILDDIR}/usr/include/mac80211/uapi "
+CFLAGS:append = " -I=${includedir}/libnl-tiny -I${STAGING_KERNEL_BUILDDIR}/usr/include/mac80211/uapi "
 
 S = "${WORKDIR}/git/tools"
 PATCH_SRC = "${@bb.utils.contains('DISTRO_FEATURES','wifi_eht','${WORKDIR}/patches-3.x','${WORKDIR}/patches',d)}"
diff --git a/recipes-wifi/lua/lua_5.3.6.bb b/recipes-wifi/lua/lua_5.3.6.bb
index 342ed1b..9ace517 100644
--- a/recipes-wifi/lua/lua_5.3.6.bb
+++ b/recipes-wifi/lua/lua_5.3.6.bb
@@ -31,12 +31,12 @@
 PACKAGECONFIG[readline] = ",,readline"
 
 UCLIBC_PATCHES += "file://uclibc-pthread.patch"
-SRC_URI_append_libc-uclibc = "${UCLIBC_PATCHES}"
+SRC_URI:append_libc-uclibc = "${UCLIBC_PATCHES}"
 
 TARGET_CC_ARCH += " -fPIC ${LDFLAGS}"
 EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -fPIC' MYLDFLAGS='${LDFLAGS}'"
 
-do_configure_prepend() {
+do_configure:prepend() {
     sed -i -e s:/usr/local:${prefix}:g src/luaconf.h
     sed -i -e s:lib/lua/:${baselib}/lua/:g src/luaconf.h
 }
diff --git a/recipes-wifi/mt76-vendor/mt76-vendor.bb b/recipes-wifi/mt76-vendor/mt76-vendor.bb
index a3fc7f2..b84b8c1 100644
--- a/recipes-wifi/mt76-vendor/mt76-vendor.bb
+++ b/recipes-wifi/mt76-vendor/mt76-vendor.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "mt76-vendor"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c188eeeb69c0a05d0545816f1458a0c9"
 
 DEPENDS += "libnl-tiny"
@@ -14,5 +14,5 @@
 
 S = "${WORKDIR}/git/src"
 
-CFLAGS_append = " -I=${includedir}/libnl-tiny "
+CFLAGS:append = " -I=${includedir}/libnl-tiny "
 
diff --git a/recipes-wifi/openssl/openssl_1.1.1%.bbappend b/recipes-wifi/openssl/openssl_1.1.1%.bbappend
index f33b0bf..f9122aa 100644
--- a/recipes-wifi/openssl/openssl_1.1.1%.bbappend
+++ b/recipes-wifi/openssl/openssl_1.1.1%.bbappend
@@ -1,5 +1,5 @@
 #add rc4 support for the security mode of wifi is PSK + TKIP
-EXTRA_OECONF_remove += "no-rc4"
+EXTRA_OECONF:remove += "no-rc4"
 
 
 
diff --git a/recipes-wifi/ubus/ubus_git.bb b/recipes-wifi/ubus/ubus_git.bb
index 324a9be..b989727 100644
--- a/recipes-wifi/ubus/ubus_git.bb
+++ b/recipes-wifi/ubus/ubus_git.bb
@@ -27,14 +27,14 @@
 OECMAKE_C_FLAGS += "-DLUA_COMPAT_5_3"
 EXTRA_OECMAKE += "-DLUAPATH=${libdir}/lua/5.3"
 
-FILES_${PN}  += "${datadir}/lua/"
-FILES_${PN}-dbg  += "${libdir}/lua/.debug"
+FILES:${PN}  += "${datadir}/lua/"
+FILES:${PN}-dbg  += "${libdir}/lua/.debug"
 
 DEPENDS += "lua"
 OECMAKE_C_FLAGS += "-I${STAGING_INCDIR}/lua5.3"
 CFLAGS += "-I${STAGING_INCDIR}/lua5.3"
 
-do_configure_prepend () {
+do_configure:prepend () {
     if [ -e "${S}/CMakeLists.txt" ] ; then
         sed -i -e \
         "s:ARCHIVE DESTINATION lib:ARCHIVE DESTINATION \${CMAKE_INSTALL_LIBDIR}:g" \
@@ -47,7 +47,7 @@
                 -DCMAKE_INSTALL_LIBDIR:PATH=/lib \
                 "
 
-do_install_append () {
+do_install:append () {
     install -dm 0755 ${D}/sbin
     ln -s /usr/sbin/ubusd ${D}/sbin/ubusd
 
@@ -65,7 +65,7 @@
             "
 
 FILES_SOLIBSDEV = ""
-FILES_lib${PN}${ABI_VERSION} += "/lib/libubus.so"
-FILES_lib${PN}-lua += "${libdir}/lua/5.3/*"
-FILES_lib${PN}-examples += "${bindir}/*.lua"
-FILES_${PN}d += "${sbindir} ${base_sbindir}"
+FILES:lib${PN}${ABI_VERSION} += "/lib/libubus.so"
+FILES:lib${PN}-lua += "${libdir}/lua/5.3/*"
+FILES:lib${PN}-examples += "${bindir}/*.lua"
+FILES:${PN}d += "${sbindir} ${base_sbindir}"
diff --git a/recipes-wifi/ubus/ubus_git.bbappend b/recipes-wifi/ubus/ubus_git.bbappend
index 65939de..a843dc2 100644
--- a/recipes-wifi/ubus/ubus_git.bbappend
+++ b/recipes-wifi/ubus/ubus_git.bbappend
@@ -67,17 +67,17 @@
 # - professional sub-contract and customization services
 #
 ################################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 inherit ${@d.getVar('DISTRO', True) == 'rdk' and 'systemd' or 'base'}
 
-SRC_URI_append_rdk += "\
+SRC_URI:append_rdk += "\
     file://ubusd.service \
 "
 
-SYSTEMD_SERVICE_${PN}_rdk = "ubusd.service"
+SYSTEMD_SERVICE:${PN}_rdk = "ubusd.service"
 
-do_install_append_rdk() {
+do_install:append_rdk() {
     # Install systemd unit files
     install -d ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/ubusd.service ${D}${systemd_unitdir}/system
diff --git a/recipes-wifi/uci/uci_git.bb b/recipes-wifi/uci/uci_git.bb
index 71598db..6149cc1 100644
--- a/recipes-wifi/uci/uci_git.bb
+++ b/recipes-wifi/uci/uci_git.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Unified Configuration Interface (UCI)"
 SECTION = "libs"
-LICENSE_NAME = "${@bb.utils.contains('DISTRO_CODENAME', 'dunfell', 'LGPL-2.1', 'LGPL-2.1-only', d)}"
+LICENSE_NAME = "${@bb.utils.contains('DISTRO_CODENAME', 'dunfell', 'LGPL-2.1-only', 'LGPL-2.1-only', d)}"
 LICENSE = "${LICENSE_NAME}"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE_NAME};md5=1a6d268fd218675ffea8be556788b780"
 
 SRC_URI = " \
-    git://git.openwrt.org/project/uci.git \
+    git://git.openwrt.org/project/uci.git;branch=master \
 "
 
 SRCREV = "f84f49f00fb70364f58b4cce72f1796a7190d370"
@@ -16,11 +16,11 @@
 
 DEPENDS += "libubox"
 
-INSANE_SKIP_${PN} += "dev-deps"
+INSANE_SKIP:${PN} += "dev-deps"
 FILES_SOLIBSDEV = ""
 
-FILES_${PN}-dev = "${includedir}/*"
-FILES_${PN} = "${bindir}/uci ${libdir}/libuci.so"
+FILES:${PN}-dev = "${includedir}/*"
+FILES:${PN} = "${bindir}/uci ${libdir}/libuci.so"
 
 inherit cmake
 
diff --git a/recipes-wifi/ucode/ucode_git.bb b/recipes-wifi/ucode/ucode_git.bb
index bf60219..11e5450 100644
--- a/recipes-wifi/ucode/ucode_git.bb
+++ b/recipes-wifi/ucode/ucode_git.bb
@@ -5,7 +5,7 @@
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b42eb47dc3802282b0d1be1bc8f5336c"
 
 SRC_URI = " \
-    git://git@github.com/jow-/ucode.git;protocol=https \
+    git://git@github.com/jow-/ucode.git;protocol=https;branch=master \
     file://0001-change-cmakelist.patch \
     file://100-nl80211_vif_radio_mask.patch \
 "
@@ -18,11 +18,11 @@
 
 DEPENDS += "libnl-tiny libubox ubus uci"
 
-INSANE_SKIP_${PN} += "file-rdeps dev-deps dev-so"
+INSANE_SKIP:${PN} += "file-rdeps dev-deps dev-so"
 FILES_SOLIBSDEV = ""
 
-FILES_${PN}-dev = "${includedir}/*"
-FILES_${PN} = "${bindir}/* ${libdir}/libucode.so* ${libdir}/ucode/*"
+FILES:${PN}-dev = "${includedir}/*"
+FILES:${PN} = "${bindir}/* ${libdir}/libucode.so* ${libdir}/ucode/*"
 
 inherit cmake pkgconfig python3native  
 
diff --git a/recipes-wifi/udebug/udebug_git.bb b/recipes-wifi/udebug/udebug_git.bb
index 614e3a0..60c4835 100644
--- a/recipes-wifi/udebug/udebug_git.bb
+++ b/recipes-wifi/udebug/udebug_git.bb
@@ -4,7 +4,7 @@
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 SRC_URI = " \
-    git://git.openwrt.org/project/udebug.git;protocol=https \
+    git://git.openwrt.org/project/udebug.git;protocol=https;branch=master \
     file://udebug.config \
     file://udebug.init \
     file://COPYING;subdir=git \
@@ -18,11 +18,11 @@
 
 DEPENDS += "libnl-tiny libubox ubus ucode"
 
-INSANE_SKIP_${PN} += "file-rdeps dev-deps dev-so"
+INSANE_SKIP:${PN} += "file-rdeps dev-deps dev-so"
 FILES_SOLIBSDEV = ""
 
-FILES_${PN}-dev = "${includedir}/*"
-FILES_${PN} = "${sbindir}/* ${libdir}/*.so* ${libdir}/ucode/*"
+FILES:${PN}-dev = "${includedir}/*"
+FILES:${PN} = "${sbindir}/* ${libdir}/*.so* ${libdir}/ucode/*"
 
 inherit cmake pkgconfig python3native  
 
diff --git a/recipes-wifi/usteer/usteer_git.bb b/recipes-wifi/usteer/usteer_git.bb
index b69f967..3bf247c 100644
--- a/recipes-wifi/usteer/usteer_git.bb
+++ b/recipes-wifi/usteer/usteer_git.bb
@@ -5,7 +5,7 @@
 SECTION = "kernel/userland"
 DEPENDS = "json-c libubox ubus libnl-tiny libpcap"
 
-SRC_URI = "git://git.openwrt.org/project/usteer.git;protocol=https"
+SRC_URI = "git://git.openwrt.org/project/usteer.git;protocol=https;branch=master"
 
 SRCREV = "7d2b17c91baf67419c0ce63dc6c65a7659ab6a5c"
 PV = "git${SRCPV}"
@@ -14,22 +14,22 @@
 
 inherit cmake pkgconfig
 
-do_install_append () {
+do_install:append () {
     install -dm 0755 ${D}/sbin
     ln -s /usr/sbin/usteerd ${D}/sbin/usteerd
 }
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 inherit ${@d.getVar('DISTRO', True) == 'rdk' and 'systemd' or 'base'}
 
-SRC_URI_append_rdk += "\
+SRC_URI:append_rdk += "\
     file://usteer.service \
 "
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-SYSTEMD_SERVICE_${PN}_rdk = "usteer.service"
+SYSTEMD_AUTO_ENABLE:${PN} = "disable"
+SYSTEMD_SERVICE:${PN}_rdk = "usteer.service"
 
-do_install_append_rdk() {
+do_install:append_rdk() {
 	# Install systemd unit files
 	install -d ${D}${systemd_unitdir}/system
 	install -m 0644 ${WORKDIR}/usteer.service ${D}${systemd_unitdir}/system
diff --git a/recipes-wifi/wifi-test-tool/wifi-test-tool.bb b/recipes-wifi/wifi-test-tool/wifi-test-tool.bb
index 414d193..a6906b0 100644
--- a/recipes-wifi/wifi-test-tool/wifi-test-tool.bb
+++ b/recipes-wifi/wifi-test-tool/wifi-test-tool.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "wifi-test-tool"
 SECTION = "applications"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fcf339a1c4fb17c1e878859b11a2cdba"
 
 DEPENDS += "libnl-tiny hal-wifi uci"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/wmm_script:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/wmm_script:"
 inherit autotools coverity
 
 SRC_URI = " \
@@ -17,10 +17,10 @@
 
 S = "${WORKDIR}/git/src"
 
-CFLAGS_append = " -DWIFI_HAL_VERSION_3 -DMTK_UCI_SUPPORT -luci "
-CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wifi_eht', '-DSINGLE_WIPHY_SUPPORT', '', d)}"
-CFLAGS_append = " -I=${includedir}/ccsp "
-do_install_append() {
+CFLAGS:append = " -DWIFI_HAL_VERSION_3 -DMTK_UCI_SUPPORT -luci "
+CFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wifi_eht', '-DSINGLE_WIPHY_SUPPORT', '', d)}"
+CFLAGS:append = " -I=${includedir}/ccsp "
+do_install:append() {
     install -d ${D}${sbindir}
     install -m 0755 ${WORKDIR}/build/wifi_test_tool ${D}${sbindir}/wifi
     install -m 0755 ${WORKDIR}/git/wmm_script/wmm-*.sh ${D}${sbindir}
diff --git a/recipes-wifi/wireless-regdb/files/patches/patches.inc b/recipes-wifi/wireless-regdb/files/patches/patches.inc
index 83f7afd..d7b5530 100644
--- a/recipes-wifi/wireless-regdb/files/patches/patches.inc
+++ b/recipes-wifi/wireless-regdb/files/patches/patches.inc
@@ -1,5 +1,5 @@
 #patch patches (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://500-world-regd-5GHz.patch \
     file://600-world-regd-6GHz.patch \
     file://700-world-regd-5G_UNII-4.patch \
diff --git a/recipes-wifi/wireless-regdb/wireless-regdb_2025.02.20.bb b/recipes-wifi/wireless-regdb/wireless-regdb_2025.02.20.bb
index 6f58b81..b6f949d 100644
--- a/recipes-wifi/wireless-regdb/wireless-regdb_2025.02.20.bb
+++ b/recipes-wifi/wireless-regdb/wireless-regdb_2025.02.20.bb
@@ -7,14 +7,14 @@
 SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz"
 SRC_URI[sha256sum] = "57f8e7721cf5a880c13ae0c202edbb21092a060d45f9e9c59bcd2a8272bfa456"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/patches:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/patches:"
 require files/patches/patches.inc
 
 inherit bin_package allarch ${@bb.utils.contains("DISTRO_FEATURES", "kirkstone", "python3native", "pythonnative", d)}
 
 S = "${WORKDIR}/${PN}-${PV}"
 
-do_install_prepend() {
+do_install:prepend() {
     (python ${S}/db2fw.py ${S}/regulatory.db ${S}/db.txt)
 }
 
diff --git a/recipes-wifi/wireless-tools/wireless-tools_30.pre9.bbappend b/recipes-wifi/wireless-tools/wireless-tools_30.pre9.bbappend
index c42e5a2..b0f61d5 100644
--- a/recipes-wifi/wireless-tools/wireless-tools_30.pre9.bbappend
+++ b/recipes-wifi/wireless-tools/wireless-tools_30.pre9.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append += "\
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI:append += "\
     file://remove_iwpriv.patch \
 "
\ No newline at end of file
diff --git a/recipes-wifi/wpa-supplicant/files/kernel6-6-patches/patches.inc b/recipes-wifi/wpa-supplicant/files/kernel6-6-patches/patches.inc
index 47eb78d..047a201 100644
--- a/recipes-wifi/wpa-supplicant/files/kernel6-6-patches/patches.inc
+++ b/recipes-wifi/wpa-supplicant/files/kernel6-6-patches/patches.inc
@@ -1,5 +1,5 @@
 #patch patches (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-step-to-hostapd-2025-02-15-version.patch \
     file://0002-sync-2025-02-12-openwrt-src-folder.patch \
     file://0003-sync-2025-02-12-openwrt-patches-folder.patch \
diff --git a/recipes-wifi/wpa-supplicant/files/patches-2.11/patches.inc b/recipes-wifi/wpa-supplicant/files/patches-2.11/patches.inc
index 9cfa81e..f8c8e79 100644
--- a/recipes-wifi/wpa-supplicant/files/patches-2.11/patches.inc
+++ b/recipes-wifi/wpa-supplicant/files/patches-2.11/patches.inc
@@ -1,5 +1,5 @@
 #patch patches (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-sync-2024-10-02-openwrt-src-folder.patch \
     file://0002-sync-2024-10-02-openwrt-patches-folder.patch \
     file://0003-hostapd-afcd-add-AFC-daemon-support.patch \
diff --git a/recipes-wifi/wpa-supplicant/files/patches/patches.inc b/recipes-wifi/wpa-supplicant/files/patches/patches.inc
index 3bf4d7e..03066f8 100644
--- a/recipes-wifi/wpa-supplicant/files/patches/patches.inc
+++ b/recipes-wifi/wpa-supplicant/files/patches/patches.inc
@@ -1,5 +1,5 @@
 #patch patches (come from openwrt/lede/target/linux/mediatek)
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://001-wolfssl-init-RNG-with-ECC-key.patch \
     file://010-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch \
     file://011-mesh-use-deterministic-channel-on-channel-switch.patch \
diff --git a/recipes-wifi/wpa-supplicant/wpa-supplicant_2.10.bb b/recipes-wifi/wpa-supplicant/wpa-supplicant_2.10.bb
index 14d38ae..7ab74ff 100644
--- a/recipes-wifi/wpa-supplicant/wpa-supplicant_2.10.bb
+++ b/recipes-wifi/wpa-supplicant/wpa-supplicant_2.10.bb
@@ -7,8 +7,8 @@
 LIC_FILES_CHKSUM = "file://hostapd/README;md5=c905478466c90f1cefc0df987c40e172"
 
 DEPENDS = "dbus libnl ubus"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/patches:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/patches:"
 
 SRCREV ?= "b704dc72ef824dfdd96674b90179b274d1d38105"
 SRC_URI = "git://w1.fi/hostap.git;protocol=https;branch=main \
@@ -33,7 +33,7 @@
 
 EXTRA_OEMAKE = "'LIBDIR=${libdir}' 'INCDIR=${includedir}' 'BINDIR=${sbindir}'"
 
-do_unpack_append() {
+do_unpack:append() {
     bb.build.exec_func('do_copy_openwrt_src', d)
 }
 
@@ -58,7 +58,7 @@
 	rm -f wpa_supplicant/*.d wpa_supplicant/dbus/*.d
 }
 
-do_configure_append () {
+do_configure:append () {
 	# from Openwrt defconfig
 	install -m 0644 ${WORKDIR}/wpa_supplicant-full.config wpa_supplicant/.config
 
@@ -153,5 +153,5 @@
 
 # move from cmf
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/libwpa_client.so"
+FILES:${PN} += "${libdir}/libwpa_client.so"
 
diff --git a/recipes-wifi/wpa-supplicant/wpa-supplicant_2.11.bb b/recipes-wifi/wpa-supplicant/wpa-supplicant_2.11.bb
index fabe490..7222b9b 100644
--- a/recipes-wifi/wpa-supplicant/wpa-supplicant_2.11.bb
+++ b/recipes-wifi/wpa-supplicant/wpa-supplicant_2.11.bb
@@ -9,8 +9,8 @@
 DEPENDS = "dbus libnl-tiny ubus ucode udebug"
 PATCH_SRC = "${@bb.utils.contains('DISTRO_FEATURES', 'kernel6-6', 'kernel6-6-patches', 'patches-${PV}', d)}"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/${PATCH_SRC}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/${PATCH_SRC}:"
 
 SRCREV ?= "96e48a05aa0a82e91e3cab75506297e433e253d0"
 require version.inc
@@ -59,7 +59,7 @@
 	rm -f wpa_supplicant/*.d wpa_supplicant/dbus/*.d
 }
 
-do_configure_append () {
+do_configure:append () {
 	# from Openwrt defconfig
 	install -m 0644 ${WORKDIR}/wpa_supplicant-full.config wpa_supplicant/.config
 
@@ -167,5 +167,5 @@
 
 # move from cmf
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/libwpa_client.so"
+FILES:${PN} += "${libdir}/libwpa_client.so"