diff options
| author | jmbills <jason.m.bills@intel.com> | 2021-08-03 01:45:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-03 01:45:08 +0300 |
| commit | 10ad77d5bc86709d8ff7f95e7040e39f1c153903 (patch) | |
| tree | 307cedb87f4c0a329740c55ac364ed489d1d8fc2 /meta-phosphor/recipes-core/os-release/os-release.bbappend | |
| parent | c6b1c6ba7a01b7987d65d61c262c44c320193108 (diff) | |
| parent | 67327ddc580cb9a85219a534844832a1682780d4 (diff) | |
| download | openbmc-10ad77d5bc86709d8ff7f95e7040e39f1c153903.tar.xz | |
Update
Diffstat (limited to 'meta-phosphor/recipes-core/os-release/os-release.bbappend')
| -rw-r--r-- | meta-phosphor/recipes-core/os-release/os-release.bbappend | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/meta-phosphor/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend index 15852327f..1a3b22898 100644 --- a/meta-phosphor/recipes-core/os-release/os-release.bbappend +++ b/meta-phosphor/recipes-core/os-release/os-release.bbappend @@ -15,7 +15,15 @@ def run_git(d, cmd): bb.warn("Unexpected exception from 'git' call: %s" % e) pass -VERSION_ID := "${@run_git(d, 'describe --dirty')}" +# DISTRO_VERSION can be overridden by a bbappend or config, so it must be a +# weak override. But, when a variable is weakly overridden the definition +# and not the contents are used in the task-hash (for sstate reuse). We need +# a strong variable in the vardeps chain for do_compile so that we get the +# contents of the 'git describe --dirty' call. Create a strong/immediate +# indirection via PHOSPHOR_OS_RELEASE_DISTRO_VERSION. +PHOSPHOR_OS_RELEASE_DISTRO_VERSION := "${@run_git(d, 'describe --dirty')}" +DISTRO_VERSION ??= "${PHOSPHOR_OS_RELEASE_DISTRO_VERSION}" + VERSION = "${@'-'.join(d.getVar('VERSION_ID').split('-')[0:2])}" BUILD_ID := "${@run_git(d, 'describe --abbrev=0')}" |