diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-07-24 12:54:46 +0100 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2013-07-27 23:28:24 -0700 |
| commit | da58843fd07dec43700a4c54ac469d1fda71aa50 (patch) | |
| tree | 4bc9a2e6d6812394caeedd522fe608d8a60e3131 | |
| parent | 8abe29811d9c5975fbd6483cb9c20b44904ae57f (diff) | |
| download | openembedded-core-da58843fd07dec43700a4c54ac469d1fda71aa50.tar.gz openembedded-core-da58843fd07dec43700a4c54ac469d1fda71aa50.tar.bz2 openembedded-core-da58843fd07dec43700a4c54ac469d1fda71aa50.zip | |
sanity.bbclass: mention version when erroring on LCONF_VERSION mismatch
If someone is using a Poky release but not the Poky distribution they'll get a
bblayers.conf generated from meta-yocto's template with a LCONF_VERSION that
doesn't necessarily match LAYER_CONF_VERSION (default in sanity.conf), as Poky
overrides LAYER_CONF_VERSION to cater for the meta-yocto split. The resulting
error message will tell them to compare bblayers.conf with bblayers.conf.sample,
but they're identical.
By explicitly refering to the required and actual versions this situation is
hopefully clearer.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/classes/sanity.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index a505a5dc34..08ab1b7393 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -401,7 +401,7 @@ def sanity_check_conffiles(status, d): status.reparse = True break if not status.reparse: - status.addresult("Your version of bblayers.conf was generated from an older/newer version of bblayers.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/bblayers.conf ${COREBASE}/meta*/conf/bblayers.conf.sample\" is a good way to visualise the changes.\n") + status.addresult("Your version of bblayers.conf has the wrong LCONF_VERSION (has %s, expecting %s).\nPlease compare the your file against bblayers.conf.sample and merge any changes before continuing.\n\"meld conf/bblayers.conf ${COREBASE}/meta*/conf/bblayers.conf.sample\" is a good way to visualise the changes.\n" % (current_lconf, lconf_version)) # If we have a site.conf, check it's valid if check_conf_exists("conf/site.conf", d): |