yocto4: CF dunfell update to kirkstone [1/1]

PD#SWPL-137072 Problem: update yocto 3.1 to 4.0 Solution: modify recipe Verify: local t5d/t5w/s4 Change-Id: Id9a7fd78d84b07df103cecd8a6e3cb6902d09685 Signed-off-by: Jiacai.Liu <[email protected]>
khadas · Nov 20, 2023 · cb80b3e · cb80b3e
1 parent 64ee001
commit cb80b3e
Show file tree

Hide file tree

Showing 127 changed files with 335 additions and 584 deletions.
diff --git a/aml-setenv.sh b/aml-setenv.sh
@@ -276,7 +276,7 @@ EOF
     #export AML_SB_SIGN_TOOL=${MESON_ROOT_PATH}/Aml_Linux_SecureBootV3_SignTool/amlogic_secureboot_sign_whole_pkg.bash
     # Setup Boot V3 config files keyes
     #export AML_SB_SIGN_CONFIG_PATH=${MESON_ROOT_PATH}/aml-comp/prebuilt/hosttools/aml-linux-sb
-    export BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE} AML_PATCH_PATH AML_SCS_SIGN_TOOL AML_SCS_SIGN_CONFIG_PATH"
+    export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS} AML_PATCH_PATH AML_SCS_SIGN_TOOL AML_SCS_SIGN_CONFIG_PATH"
     echo "==========================================="
     echo
     echo "MACHINE=${TARGET_MACHINE}"

diff --git a/conf/include/bbmasks-amlogic-platform.inc b/conf/include/bbmasks-amlogic-platform.inc
@@ -19,3 +19,5 @@ BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '', '|meta-meson/r
 BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'kernel_515', '', '|meta-meson/recipes-core/util-linux/util-linux_%.bbappend', d)}"
 BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'kernel_515', '', '|meta-meson/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bbappend', d)}"
 BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'kernel_515', bb.utils.contains('DISTRO_FEATURES', 'selinux', '', '|meta-meson/recipes-security/audit/audit_%.bbappend', d), '|meta-meson/recipes-security/audit/audit_%.bbappend', d)}"
+BBMASK .= "|meta-thunder/recipes-support/curl/curl_7.69%.bbappend"
+BBMASK .= "|meta-thunder/recipes-devtools/breakpad/"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
@@ -214,15 +214,15 @@ PATCHRESOLVE = "noop"
 # files and damages the build in ways which may not be easily recoverable.
 # It's necesary to monitor /tmp, if there is no space left the build will fail
 # with very exotic errors.
-BB_DISKMON_DIRS = "\
+BB_DISKMON_DIRS ??= "\
     STOPTASKS,${TMPDIR},1G,100K \
     STOPTASKS,${DL_DIR},1G,100K \
     STOPTASKS,${SSTATE_DIR},1G,100K \
     STOPTASKS,/tmp,100M,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K \
-    ABORT,/tmp,10M,1K"
+    HALT,${TMPDIR},100M,1K \
+    HALT,${DL_DIR},100M,1K \
+    HALT,${SSTATE_DIR},100M,1K \
+    HALT,/tmp,10M,1K"
 
 #
 # Shared-state files from other locations
@@ -266,7 +266,7 @@ BB_SRCREV_POLICY ??= "cache"
 # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
 # track the version of this file when it was generated. This can safely be ignored if
 # this doesn't mean anything to you.
-CONF_VERSION = "1"
+CONF_VERSION = "2"
 
 #
 # Debugging Tools
@@ -276,5 +276,5 @@ CONF_VERSION = "1"
 # This option enables gperftools heap checking for the entire build (for recipes that set ENABLE_GPERFTOOLS_HEAPCHECK_WP_DISTRO = “1”).
 # It can be added on a per-recipe basis by adding ENABLE_GPERFTOOLS_HEAPCHECK_WP_RECIPE = “1” to a recipe.
 #DISTRO_FEATURES_RDK += "comcast-gperftools-heapcheck-wp"
-LICENSE_FLAGS_WHITELIST="commercial"
+LICENSE_FLAGS_ACCEPTED="commercial"
 
diff --git a/conf/machine/include/amlogic_32b.inc b/conf/machine/include/amlogic_32b.inc
@@ -4,8 +4,8 @@ DEFAULTTUNE = "armv7athf-neon"
 PREFERRED_PROVIDER_virtual/gst-plugins-playersinkbin = "gst-plugins-playersinkbin-rpi"
 #PREFERRED_PROVIDER_virtual/iarmmgrs-hal = "iarmmgrs-hal-amlogic"
 #PREFERRED_PROVIDER_virtual/mfrlib = "mfrlib-amlogic"
-#DISTRO_FEATURES:remove += "opengl gl"
-DISTRO_FEATURES:remove += "parodus 3g zeroconf"
+#DISTRO_FEATURES:remove = "opengl gl"
+DISTRO_FEATURES:remove = "parodus 3g zeroconf"
 VIRTUAL-RUNTIME_alsa-state ?= "alsa-states"
 
 # append drm(wayland drm backend)

diff --git a/conf/machine/include/amlogic_64b.inc b/conf/machine/include/amlogic_64b.inc
@@ -4,8 +4,8 @@
 PREFERRED_PROVIDER_virtual/gst-plugins-playersinkbin = "gst-plugins-playersinkbin-rpi"
 #PREFERRED_PROVIDER_virtual/iarmmgrs-hal = "iarmmgrs-hal-amlogic"
 #PREFERRED_PROVIDER_virtual/mfrlib = "mfrlib-amlogic"
-#DISTRO_FEATURES:remove += "opengl gl"
-DISTRO_FEATURES:remove += "parodus 3g zeroconf"
+#DISTRO_FEATURES:remove = "opengl gl"
+DISTRO_FEATURES:remove = "parodus 3g zeroconf"
 VIRTUAL-RUNTIME_alsa-state ?= "alsa-states"
 
 # append drm(wayland drm backend)

diff --git a/conf/machine/include/amlogic_externalsrc.inc b/conf/machine/include/amlogic_externalsrc.inc
@@ -38,7 +38,7 @@ EXTERNALSRC:pn-aml-bootloader-message = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/
 EXTERNALSRC:pn-aml-utils = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/aml_commonlib/utils' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/aml_commonlib/utils')) else ''}"
 EXTERNALSRC:pn-ap6xxx = "${@'${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.4/wifi/broadcom/drivers/ap6xxx' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.4/wifi/broadcom/drivers/ap6xxx')) else ''}"
 EXTERNALSRC:pn-qca6174 = "${@'${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.4/wifi/qualcomm/drivers/qca6174' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.4/wifi/qualcomm/drivers/qca6174')) else ''}"
-EXTERNALSRC:pn-qca6174_k5.15 = "${@'${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.15/wifi/qualcomm/drivers/qca6174' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.15/wifi/qualcomm/drivers/qca6174')) else ''}"
+EXTERNALSRC:pn-qca6174:k5.15 = "${@'${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.15/wifi/qualcomm/drivers/qca6174' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.15/wifi/qualcomm/drivers/qca6174')) else ''}"
 EXTERNALSRC:pn-aml-wifi-w1 = "${@'${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.4/wifi/amlogic/drivers/w1' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.4/wifi/amlogic/drivers/w1')) else ''}"
 EXTERNALSRC:pn-aml-bt-w1 = "${@'${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.4/bluetooth/amlogic' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.4/bluetooth/amlogic')) else ''}"
 EXTERNALSRC:pn-rtk8723bu = "${@'${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.4/wifi/realtek/drivers/8723bu' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.4/wifi/realtek/drivers/8723bu')) else ''}"
@@ -53,9 +53,9 @@ EXTERNALSRC:pn-tuner = "${@'${MESON_ROOT_PATH}/aml-comp/hardware/aml-4.9/tuner'
 EXTERNALSRC:pn-aml-hdcprx = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/hdcp' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/hdcp')) else ''}"
 EXTERNALSRC:pn-aml-provision = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/provision' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/provision')) else ''}"
 EXTERNALSRC:pn-aml-efuse = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/efuse' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/efuse')) else ''}"
-EXTERNALSRC:pn-optee-userspace_t5d = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk')) else ''}"
-EXTERNALSRC:pn-optee-scripts-native_t5d = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk')) else ''}"
-EXTERNALSRC:pn-optee-linux-driver_t5d = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk')) else ''}"
+EXTERNALSRC:pn-optee-userspace:t5d = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk')) else ''}"
+EXTERNALSRC:pn-optee-scripts-native:t5d = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk')) else ''}"
+EXTERNALSRC:pn-optee-linux-driver:t5d = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk')) else ''}"
 EXTERNALSRC:pn-optee-userspace = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk-3.8' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk-3.8')) else ''}"
 EXTERNALSRC:pn-optee-scripts-native = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk-3.8' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk-3.8')) else ''}"
 EXTERNALSRC:pn-optee-linux-driver = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk-3.8' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/tdk-3.8')) else ''}"
@@ -69,21 +69,21 @@ EXTERNALSRC:pn-aml-mediadrm-cleartvp-bin = "${@'${MESON_ROOT_PATH}/aml-comp/mult
 EXTERNALSRC:pn-gst-plugin-aml-asink = "${@'${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-asink' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-asink')) else ''}"
 EXTERNALSRC:pn-gst-plugin-video-sink = "${@'${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-video-sink' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-video-sink')) else ''}"
 EXTERNALSRC:pn-gst-plugin-aml-v4l2dec = "${@'${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-v4l2dec' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-v4l2dec')) else ''}"
-EXTERNALSRC_pn-gst-plugin-aml-demux = "${@'${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-demux' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-demux')) else ''}"
+EXTERNALSRC:pn-gst-plugin-aml-demux = "${@'${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-demux' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-demux')) else ''}"
 EXTERNALSRC:pn-gst-agmplayer = "${@'${MESON_ROOT_PATH}/aml-comp/multimedia/gst_agmplayer' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/multimedia/gst_agmplayer')) else ''}"
 EXTERNALSRC:pn-gst-plugin-aml-picsink = "${@'${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-picsink' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-picsink')) else ''}"
 EXTERNALSRC:pn-gst-plugin-aml-subtitlesink = "${@'${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-subtitlesink' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-subtitlesink')) else ''}"
 EXTERNALSRC:pn-gst-aml-drm-plugins = "${@'${MESON_ROOT_PATH}/aml-comp/multimedia/gst-aml-drm-plugins1/gst-aml-drm-plugins-1.0' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/multimedia/gst-aml-drm-plugins1/gst-aml-drm-plugins-1.0')) else ''}"
-EXTERNALSRC_pn-gst-plugin-aml-wlcdmi = "${@'${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-wlcdmi' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-wlcdmi')) else ''}"
-EXTERNALSRC_pn-wlcdmi-bin = "${@'${MESON_ROOT_PATH}/aml-comp/multimedia/libmediadrm/wlcdmi-bin' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/multimedia/libmediadrm/wlcdmi-bin')) else ''}"
+EXTERNALSRC:pn-gst-plugin-aml-wlcdmi = "${@'${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-wlcdmi' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/multimedia/gst-plugin-aml-wlcdmi')) else ''}"
+EXTERNALSRC:pn-wlcdmi-bin = "${@'${MESON_ROOT_PATH}/aml-comp/multimedia/libmediadrm/wlcdmi-bin' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/multimedia/libmediadrm/wlcdmi-bin')) else ''}"
 EXTERNALSRC:pn-dvalin = "${@'${MESON_ROOT_PATH}/aml-comp/hardware/aml-4.9/arm/gpu' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/hardware/aml-4.9/arm/gpu')) else ''}"
 EXTERNALSRC:pn-gondul = "${@'${MESON_ROOT_PATH}/aml-comp/hardware/aml-4.9/arm/gpu' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/hardware/aml-4.9/arm/gpu')) else ''}"
 EXTERNALSRC:pn-meson-display = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/meson_display/display_framework' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/meson_display/display_framework')) else ''}"
 EXTERNALSRC:pn-libdrm-meson = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/libdrm_amlogic/meson' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/libdrm_amlogic')) else ''}"
 EXTERNALSRC:pn-libgles-eabihf-dvalin-wayland-drm = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/meson_mali' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/meson_mali')) else ''}"
 EXTERNALSRC:pn-libgles-eabihf-gondul-wayland-drm = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/meson_mali' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/meson_mali')) else ''}"
 EXTERNALSRC:pn-linux-meson = "${@'${MESON_ROOT_PATH}/aml-comp/kernel/aml-5.4' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/kernel/aml-5.4')) else ''}"
-EXTERNALSRC:pn-linux-meson_k5.15 = "${@'${MESON_ROOT_PATH}/aml-comp/kernel/aml-5.15' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/kernel/aml-5.15')) else ''}"
+EXTERNALSRC:pn-linux-meson:k5.15 = "${@'${MESON_ROOT_PATH}/aml-comp/kernel/aml-5.15' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/kernel/aml-5.15')) else ''}"
 EXTERNALSRC:pn-u-boot = "${@'${MESON_ROOT_PATH}/aml-comp/uboot' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/uboot')) else ''}"
 EXTERNALSRC:pn-media-modules = "${@'${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.15/amlogic/media_modules' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/hardware/aml-5.15/amlogic/media_modules')) else ''}"
 EXTERNALSRC:pn-aml-dtvdemod = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/dtvdemod' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/dtvdemod')) else ''}"
@@ -167,8 +167,8 @@ EXTERNALSRC:pn-aml-dvb-ota = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/dvb
 EXTERNALSRC:pn-aml-dvb-ota-dtvkit = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/dvb_ota' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/dvb_ota')) else ''}"
 EXTERNALSRC:pn-aml-dvb-ota-dtvkit-prebuilt = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/dvb_ota' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/dvb_ota')) else ''}"
 EXTERNALSRC:pn-aml-avb-dm-verity = "${@'${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/aml_avb_dm_verity' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/vendor/amlogic/aml_avb_dm_verity')) else ''}"
-EXTERNALSRC_pn-disney-src = "${@'${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus')) else ''}"
-EXTERNALSRC_pn-disney-plugin = "${@'${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus/wpe-plugin-disney' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus/wpe-plugin-disney')) else ''}"
-EXTERNALSRC_pn-disney-basic-tests = "${@'${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus')) else ''}"
-EXTERNALSRC_pn-disney-shield-agent = "${@'${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus')) else ''}"
-EXTERNALSRC_pn-disney-shield-extensions = "${@'${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus')) else ''}"
+EXTERNALSRC:pn-disney-src = "${@'${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus')) else ''}"
+EXTERNALSRC:pn-disney-plugin = "${@'${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus/wpe-plugin-disney' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus/wpe-plugin-disney')) else ''}"
+EXTERNALSRC:pn-disney-basic-tests = "${@'${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus')) else ''}"
+EXTERNALSRC:pn-disney-shield-agent = "${@'${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus')) else ''}"
+EXTERNALSRC:pn-disney-shield-extensions = "${@'${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus' if (os.path.isdir('${MESON_ROOT_PATH}/aml-comp/thirdparty/disney-plus')) else ''}"
diff --git a/conf/machine/include/amlogic_weston.inc b/conf/machine/include/amlogic_weston.inc
@@ -1,8 +1,8 @@
 #For Weston
 DISTRO_FEATURES:append = " weston wayland weston-init"
 PREFERRED_VERSION_weston = "10.0.0"
-PREFERRED_VERSION_wayland = "1.19.0"
-PREFERRED_VERSION_wayland-protocol = "1.24.0"
+PREFERRED_VERSION_wayland = "1.20.0"
+PREFERRED_VERSION_wayland-protocol = "1.25.0"
 DISTRO_FEATURES:remove = " mesa mesa-gl x11"
 
 DISTRO_FEATURES:remove = " amazon youtube netflix"
diff --git a/conf/machine/mesons4-ap222-common.inc b/conf/machine/mesons4-ap222-common.inc
@@ -8,6 +8,10 @@ PREFERRED_PROVIDER_virtual/egl = "libgles-eabihf-dvalin-wayland-drm"
 PREFERRED_PROVIDER_virtual/libgl = "libgles-eabihf-dvalin-wayland-drm"
 PREFERRED_PROVIDER_virtual/libgles1 = "libgles-eabihf-dvalin-wayland-drm"
 PREFERRED_PROVIDER_virtual/libgles2 = "libgles-eabihf-dvalin-wayland-drm"
+PREFERRED_PROVIDER_virtual/nativesdk-egl = "libgles-eabihf-dvalin-wayland-drm"
+PREFERRED_PROVIDER_virtual/egl-native = "libgles-eabihf-dvalin-wayland-drm"
+PREFERRED_PROVIDER_virtual/nativesdk-libgl = "nativesdk-mesa-gl"
+PREFERRED_PROVIDER_virtual/libgl-native = "mesa-gl-native"
 
 MACHINE_EXTRA_RRECOMMENDS += " \
         wififw-qca6174 \

diff --git a/conf/machine/mesonsc2-ah212-common.inc b/conf/machine/mesonsc2-ah212-common.inc
@@ -12,6 +12,11 @@ PREFERRED_PROVIDER_virtual/egl = "libgles-eabihf-dvalin-wayland-drm"
 PREFERRED_PROVIDER_virtual/libgl = "libgles-eabihf-dvalin-wayland-drm"
 PREFERRED_PROVIDER_virtual/libgles1 = "libgles-eabihf-dvalin-wayland-drm"
 PREFERRED_PROVIDER_virtual/libgles2 = "libgles-eabihf-dvalin-wayland-drm"
+PREFERRED_PROVIDER_virtual/nativesdk-egl = "libgles-eabihf-dvalin-wayland-drm"
+PREFERRED_PROVIDER_virtual/egl-native = "libgles-eabihf-dvalin-wayland-drm"
+PREFERRED_PROVIDER_virtual/nativesdk-libgl = "nativesdk-mesa-gl"
+PREFERRED_PROVIDER_virtual/libgl-native = "mesa-gl-native"
+
 
 MACHINE_EXTRA_RRECOMMENDS += " \
         wififw-qca6174 \

diff --git a/conf/machine/mesont5d-am301-common.inc b/conf/machine/mesont5d-am301-common.inc
@@ -8,6 +8,10 @@ PREFERRED_PROVIDER_virtual/egl = "libgles-eabihf-dvalin-wayland-drm"
 PREFERRED_PROVIDER_virtual/libgl = "libgles-eabihf-dvalin-wayland-drm"
 PREFERRED_PROVIDER_virtual/libgles1 = "libgles-eabihf-dvalin-wayland-drm"
 PREFERRED_PROVIDER_virtual/libgles2 = "libgles-eabihf-dvalin-wayland-drm"
+PREFERRED_PROVIDER_virtual/nativesdk-egl = "libgles-eabihf-dvalin-wayland-drm"
+PREFERRED_PROVIDER_virtual/egl-native = "libgles-eabihf-dvalin-wayland-drm"
+PREFERRED_PROVIDER_virtual/nativesdk-libgl = "nativesdk-mesa-gl"
+PREFERRED_PROVIDER_virtual/libgl-native = "mesa-gl-native"
 
 MACHINE_EXTRA_RRECOMMENDS += " \
         rtk8723du \

diff --git a/conf/machine/mesont5w-at301-common.inc b/conf/machine/mesont5w-at301-common.inc
@@ -8,6 +8,10 @@ PREFERRED_PROVIDER_virtual/egl = "libgles-eabihf-dvalin-wayland-drm"
 PREFERRED_PROVIDER_virtual/libgl = "libgles-eabihf-dvalin-wayland-drm"
 PREFERRED_PROVIDER_virtual/libgles1 = "libgles-eabihf-dvalin-wayland-drm"
 PREFERRED_PROVIDER_virtual/libgles2 = "libgles-eabihf-dvalin-wayland-drm"
+PREFERRED_PROVIDER_virtual/nativesdk-egl = "libgles-eabihf-dvalin-wayland-drm"
+PREFERRED_PROVIDER_virtual/egl-native = "libgles-eabihf-dvalin-wayland-drm"
+PREFERRED_PROVIDER_virtual/nativesdk-libgl = "nativesdk-mesa-gl"
+PREFERRED_PROVIDER_virtual/libgl-native = "mesa-gl-native"
 
 MACHINE_EXTRA_RRECOMMENDS += " \
         rtk8822cu \

diff --git a/oe-init-build-env-meson b/oe-init-build-env-meson
@@ -60,7 +60,7 @@ cp $OEROOT/poky/.templateconf $OEROOT
 
 . $OEROOT/meta-meson/scripts/setup-environment-internal
 export MESON_ROOT_PATH=$OEROOT
-export BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE} MESON_ROOT_PATH"
+export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS} MESON_ROOT_PATH"
 unset OEROOT
 unset BBPATH
 

diff --git a/recipes-bsp/u-boot/u-boot_2015.01.bb b/recipes-bsp/u-boot/u-boot_2015.01.bb
@@ -7,9 +7,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files_2015/bl31/bin:"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files_2015/bl31_1.3/bin:"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files_2015/fip:"
 
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
 EXTRA_OEMAKE = ''
 PACKAGE_ARCH = "${MACHINE_ARCH}"

diff --git a/recipes-bsp/u-boot/u-boot_2019.01.bb b/recipes-bsp/u-boot/u-boot_2019.01.bb
@@ -9,9 +9,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files_2019/bl31_1.3/bin:"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files_2019/bl32_3.8/bin:"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files_2019/fip:"
 
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
 EXTRA_OEMAKE = ''
 PACKAGE_ARCH = "${MACHINE_ARCH}"

diff --git a/recipes-bsp/u-boot/u-boot_2023.01.bb b/recipes-bsp/u-boot/u-boot_2023.01.bb
@@ -11,7 +11,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files_2023/bl32_3.8/bin:"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files_2023/bl32_3.18/bin:"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files_2023/fip:"
 
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 

diff --git a/recipes-bsp/u-boot/u-boot_m805.bb b/recipes-bsp/u-boot/u-boot_m805.bb
@@ -1,6 +1,6 @@
 require u-boot-meson.inc
 
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 EXTRA_OEMAKE = ''