poky: use poky 5.0.7

nashif · nashif · commit 81443edbda7b · 2025-03-08T08:23:00.000-05:00
Use upstream and supported poky release

Signed-off-by: Anas Nashif &lt;anas.nashif@intel.com&gt;
diff --git a/meta-zephyr-sdk/conf/distro/include/zephyr-sdk.inc b/meta-zephyr-sdk/conf/distro/include/zephyr-sdk.inc
@@ -20,3 +20,6 @@ SSTATE_DIR ?= "${TOPDIR}/../zephyr-cache/sstate-cache"
 CACHE_forcevariable = "${TOPDIR}/../zephyr-cache/cache"
 PERSISTENT_DIR = "${TOPDIR}/../zephyr-cache/persistent"
 DL_DIR ?= "${TOPDIR}/../zephyr-downloads"
+
+PREFERRED_VERSION_meson:forcevariable = "1.7.%"
+PREFERRED_VERSION_nativesdk-meson:forcevariable = "1.7.%"
diff --git a/meta-zephyr-sdk/conf/layer.conf b/meta-zephyr-sdk/conf/layer.conf
@@ -9,4 +9,4 @@ LICENSE_PATH += "${LAYERDIR}/files/additional-licenses"
 BBFILE_COLLECTIONS += "zephyr-sdk"
 BBFILE_PATTERN_zephyr-sdk := "^${LAYERDIR}/"
 BBFILE_PRIORITY_zephyr-sdk = "8"
-
+LAYERSERIES_COMPAT_zephyr_sdk = "Scarthgap"
diff --git a/meta-zephyr-sdk/scripts/meta-zephyr-sdk-clone.sh b/meta-zephyr-sdk/scripts/meta-zephyr-sdk-clone.sh
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
-POKY_KNOWN_COMMIT=${POKY_COMMIT:-"54488c030cef432c682c2f91b5e3f43dbd560a1c"}
+POKY_KNOWN_COMMIT=${POKY_COMMIT:-"80838b8aa5a74bf3ba03dc5934c39192300a69f1"}
 META_ZEPHYR_SDK_SOURCE=${SDK_SOURCE:-"meta-zephyr-sdk"}
 META_POKY_SOURCE=${POKY_SOURCE:-"poky"}
 META_ZEPHYR_SDK_SOURCE=$(readlink -f $META_ZEPHYR_SDK_SOURCE)

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.`
`19`	`19`	`#`
`20`	`20`
`21`		`-POKY_KNOWN_COMMIT=${POKY_COMMIT:-"54488c030cef432c682c2f91b5e3f43dbd560a1c"}`
	`21`	`+POKY_KNOWN_COMMIT=${POKY_COMMIT:-"80838b8aa5a74bf3ba03dc5934c39192300a69f1"}`
`22`	`22`	`META_ZEPHYR_SDK_SOURCE=${SDK_SOURCE:-"meta-zephyr-sdk"}`
`23`	`23`	`META_POKY_SOURCE=${POKY_SOURCE:-"poky"}`
`24`	`24`	`META_ZEPHYR_SDK_SOURCE=$(readlink -f $META_ZEPHYR_SDK_SOURCE)`