summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-09 17:25:27 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-09 17:32:51 (GMT)
commit89ae28983c5fb3ce9d13fd337450ac709cc5efcd (patch)
tree19cbd0de739f9d79404d0e7373b18800c133265d
parentd2f1390c9c2341a1a8ab9f3088b59ed45c6268f5 (diff)
downloadpoky-89ae28983c5fb3ce9d13fd337450ac709cc5efcd.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-poky/conf/distro/poky.conf6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index 599e235..b33df3c 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)"
3DISTRO_VERSION = "3.2+snapshot-${METADATA_REVISION}" 3DISTRO_VERSION = "3.2+snapshot-${METADATA_REVISION}"
4DISTRO_CODENAME = "master" 4DISTRO_CODENAME = "master"
5SDK_VENDOR = "-pokysdk" 5SDK_VENDOR = "-pokysdk"
6SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}" 6SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}"
7SDK_VERSION[vardepvalue] = "${SDK_VERSION}"
7 8
8MAINTAINER = "Poky <poky@lists.yoctoproject.org>" 9MAINTAINER = "Poky <poky@lists.yoctoproject.org>"
9 10
@@ -11,9 +12,6 @@ TARGET_VENDOR = "-poky"
11 12
12LOCALCONF_VERSION = "1" 13LOCALCONF_VERSION = "1"
13 14
14DISTRO_VERSION[vardepsexclude] = "DATE"
15SDK_VERSION[vardepsexclude] = "DATE"
16
17# Override these in poky based distros 15# Override these in poky based distros
18POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan" 16POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan"
19POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" 17POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"