From 89ae28983c5fb3ce9d13fd337450ac709cc5efcd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 9 Dec 2020 17:25:27 +0000 Subject: poky: Set SDK_VERSION explicitly After the change from DATE in DISTRO_VERSION, we need to adjust SDK_VERSION. Remove the unneeded vardepexclude. Ensure the value of SDK_VERSION only causes rebuilds when the value changes. (From meta-yocto rev: dc719ee87b4f40a6cf2eadc5767940ad41ab7d64) Signed-off-by: Richard Purdie --- meta-poky/conf/distro/poky.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index 599e2357a0..b33df3c17f 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf @@ -3,7 +3,8 @@ DISTRO_NAME = "Poky (Yocto Project Reference Distro)" DISTRO_VERSION = "3.2+snapshot-${METADATA_REVISION}" DISTRO_CODENAME = "master" SDK_VENDOR = "-pokysdk" -SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}" +SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" +SDK_VERSION[vardepvalue] = "${SDK_VERSION}" MAINTAINER = "Poky " @@ -11,9 +12,6 @@ TARGET_VENDOR = "-poky" LOCALCONF_VERSION = "1" -DISTRO_VERSION[vardepsexclude] = "DATE" -SDK_VERSION[vardepsexclude] = "DATE" - # Override these in poky based distros POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan" POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" -- cgit v1.2.3-54-g00ecf