diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-09 17:25:27 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-09 17:32:51 +0000 |
| commit | 89ae28983c5fb3ce9d13fd337450ac709cc5efcd (patch) | |
| tree | 19cbd0de739f9d79404d0e7373b18800c133265d | |
| parent | d2f1390c9c2341a1a8ab9f3088b59ed45c6268f5 (diff) | |
| download | poky-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.conf | 6 |
1 files 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)" | |||
| 3 | DISTRO_VERSION = "3.2+snapshot-${METADATA_REVISION}" | 3 | DISTRO_VERSION = "3.2+snapshot-${METADATA_REVISION}" |
| 4 | DISTRO_CODENAME = "master" | 4 | DISTRO_CODENAME = "master" |
| 5 | SDK_VENDOR = "-pokysdk" | 5 | SDK_VENDOR = "-pokysdk" |
| 6 | SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}" | 6 | SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" |
| 7 | SDK_VERSION[vardepvalue] = "${SDK_VERSION}" | ||
| 7 | 8 | ||
| 8 | MAINTAINER = "Poky <poky@lists.yoctoproject.org>" | 9 | MAINTAINER = "Poky <poky@lists.yoctoproject.org>" |
| 9 | 10 | ||
| @@ -11,9 +12,6 @@ TARGET_VENDOR = "-poky" | |||
| 11 | 12 | ||
| 12 | LOCALCONF_VERSION = "1" | 13 | LOCALCONF_VERSION = "1" |
| 13 | 14 | ||
| 14 | DISTRO_VERSION[vardepsexclude] = "DATE" | ||
| 15 | SDK_VERSION[vardepsexclude] = "DATE" | ||
| 16 | |||
| 17 | # Override these in poky based distros | 15 | # Override these in poky based distros |
| 18 | POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan" | 16 | POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan" |
| 19 | POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" | 17 | POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" |
