From 4cee85ecd6cf356f9cef28cf042065204ad5baff Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 26 Jan 2016 15:40:19 +0200 Subject: Add meta layer revision info to image and toolchain The branch and revision of each meta layer used in the build are stored in the image (/etc/build) and in the toolchain (${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS}). Change-Id: Ic4be1cff62e11746ee3ec61c7909ed8c35c84db2 Reviewed-by: Teemu Holappa --- conf/local.conf.sample | 1 + recipes/meta/meta-environment.bbappend | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 recipes/meta/meta-environment.bbappend diff --git a/conf/local.conf.sample b/conf/local.conf.sample index d8029f2..5bd8355 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -286,6 +286,7 @@ svn://.*/.* http://ci-files01-hki.ci.local/yocto/sources/ \n" CONF_VERSION = "1" INHERIT += "rm_work" +INHERIT += "image-buildinfo" ACCEPT_FSL_EULA = "1" LICENSE_FLAGS_WHITELIST = "commercial" diff --git a/recipes/meta/meta-environment.bbappend b/recipes/meta/meta-environment.bbappend new file mode 100644 index 0000000..93500c0 --- /dev/null +++ b/recipes/meta/meta-environment.bbappend @@ -0,0 +1,26 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +toolchain_create_sdk_version_append () { + echo 'Layer Revisions:' >> $versionfile + echo '${@get_layer_revs(d)}' >> $versionfile +} -- cgit v1.2.3-54-g00ecf