meta-phosphor: os-release: Set weak default to DISTRO_VERSION
Improved practice to use DISTRO_VERSION instead of the undocumented
VERSION_ID.
DISTRO_VERSION is documented in yocto
https://www.yoctoproject.org/docs/latest/ref-manual/ref-manual.html
and specified in this section about creating your own distribution.
https://docs.yoctoproject.org/dev-manual/common-tasks.html#creating-your-own-distribution
VERSION_ID is undocumented and will more likely be changed compared
to the documented DISTRO_VERSION.
The VERSION_ID is set to DISTRO_VERSION in poky/.../os-release.bb
Use weak default to DISTRO_VERSION instead of overriding VERSION_ID.
This allows other layers to override in *.bbappend or *.conf.
Tested:
```
root@romulus:~# cat /etc/os-release
ID=openbmc-openpower
NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)"
VERSION="2.11.0-dev"
VERSION_ID=2.11.0-dev-165-g20885c497
PRETTY_NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro) 2.11.0-dev"
BUILD_ID="2.11.0-dev"
OPENBMC_TARGET_MACHINE="romulus"
```
Signed-off-by: Willy Tu <wltu@google.com>
Change-Id: I25b5a165b764e6562fa8008c9d2a75a82fb09139
diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc
index 1d8cc4a..e42c8c2 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -69,7 +69,6 @@
require conf/distro/include/yocto-uninative.inc
DISTRO_NAME = "Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)"
-DISTRO_VERSION = "0.1.0"
TARGET_VENDOR="-openbmc"
VIRTUAL-RUNTIME_keymaps = ""
diff --git a/meta-phosphor/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend
index 1585232..f42235e 100644
--- a/meta-phosphor/recipes-core/os-release/os-release.bbappend
+++ b/meta-phosphor/recipes-core/os-release/os-release.bbappend
@@ -15,7 +15,7 @@
bb.warn("Unexpected exception from 'git' call: %s" % e)
pass
-VERSION_ID := "${@run_git(d, 'describe --dirty')}"
+DISTRO_VERSION ??= "${@run_git(d, 'describe --dirty')}"
VERSION = "${@'-'.join(d.getVar('VERSION_ID').split('-')[0:2])}"
BUILD_ID := "${@run_git(d, 'describe --abbrev=0')}"