From b5a2c26b248ab6cfb47a346fcec542f2297d297b Mon Sep 17 00:00:00 2001 From: Lei YU Date: Wed, 15 May 2019 19:52:10 -0400 Subject: meta-phosphor: Improve kernel version string The kernel version string by yocto by default is -, e.g. 5.0.7-b1b37a25644213428f4bab4c427581dd923e35da Where the revision is the version specified by SRCREV, no matter if there are additional pathces applied or not. This commit improves it by * If there are no yocto patches, keep the current version but use a shorter revision, e.g. 5.0.7-b1b37a2 * If there are yocto patches, append -dirty- to the version string, e.g. 5.0.7-b1b37a2-dirty-84fa553 Resolves openbmc/openbmc#1289 Tested: Verify the kernel version string is changed as above depending on if there are yocto patches. (From meta-phosphor rev: fcfd10d7380309bc274c4f5a8355ecaeb60ce439) Change-Id: I4210227a981721a6b322d640984ea58c57802cb1 Signed-off-by: Lei YU Signed-off-by: Brad Bishop --- meta-phosphor/conf/distro/include/phosphor-base.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta-phosphor/conf/distro/include') diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 9cb9f861e..b6f155122 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -148,3 +148,5 @@ BAD_RECOMMENDATIONS_pn-obmc-phosphor-image = "udev-hwdb" BAD_RECOMMENDATIONS_pn-obmc-phosphor-image += "shared-mime-info" LAYER_CONF_VERSION ?= "8" + +KERNEL_CLASSES_append = " obmc-phosphor-kernel-version" -- cgit v1.2.3