Patchwork sanity.bbclass: mention version when erroring on LCONF_VERSION mismatch

login
register
mail settings
Submitter Ross Burton
Date July 24, 2013, 11:54 a.m.
Message ID <1374666886-30003-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/54303/
State Accepted
Commit da58843fd07dec43700a4c54ac469d1fda71aa50
Headers show

Comments

Ross Burton - July 24, 2013, 11:54 a.m.
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>
---
 meta/classes/sanity.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index a505a5d..08ab1b7 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):