diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-06-24 10:53:36 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:37 +0100 |
commit | 04b2a788378fd45e7312a1dc393daf1993d92ab2 (patch) | |
tree | 2a201f23394d60ebe814d064bdc6e981d12dae3a | |
parent | ecbd5ca720ce28284280dc60013b3f60e9dd934f (diff) | |
download | poky-04b2a788378fd45e7312a1dc393daf1993d92ab2.tar.gz |
Add a warning if a BBFILE_PATTERN doesn't match any bb files
Likely cause is, of course, typo in the pattern or incorrect BBFILES, so we
should warn the user about this.
(Bitbake rev: b781317b5006bc047a59e7fa3c93344115e78ccb)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | bitbake/lib/bb/cooker.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 6884e9a554..7fbfb5beb5 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -446,9 +446,12 @@ class BBCooker: | |||
446 | bb.data.update_data(localdata) | 446 | bb.data.update_data(localdata) |
447 | bb.data.expandKeys(localdata) | 447 | bb.data.expandKeys(localdata) |
448 | 448 | ||
449 | matched = set() | ||
449 | def calc_bbfile_priority(filename): | 450 | def calc_bbfile_priority(filename): |
450 | for (regex, pri) in self.status.bbfile_config_priorities: | 451 | for _, _, regex, pri in self.status.bbfile_config_priorities: |
451 | if regex.match(filename): | 452 | if regex.match(filename): |
453 | if not regex in matched: | ||
454 | matched.add(regex) | ||
452 | return pri | 455 | return pri |
453 | return 0 | 456 | return 0 |
454 | 457 | ||
@@ -467,6 +470,11 @@ class BBCooker: | |||
467 | for p in self.status.pkg_fn: | 470 | for p in self.status.pkg_fn: |
468 | self.status.bbfile_priority[p] = calc_bbfile_priority(p) | 471 | self.status.bbfile_priority[p] = calc_bbfile_priority(p) |
469 | 472 | ||
473 | for collection, pattern, regex, _ in self.status.bbfile_config_priorities: | ||
474 | if not regex in matched: | ||
475 | bb.msg.warn(bb.msg.domain.Provider, "No bb files matched BBFILE_PATTERN_%s '%s'" % | ||
476 | (collection, pattern)) | ||
477 | |||
470 | def buildWorldTargetList(self): | 478 | def buildWorldTargetList(self): |
471 | """ | 479 | """ |
472 | Build package list for "bitbake world" | 480 | Build package list for "bitbake world" |
@@ -594,7 +602,7 @@ class BBCooker: | |||
594 | continue | 602 | continue |
595 | try: | 603 | try: |
596 | pri = int(priority) | 604 | pri = int(priority) |
597 | self.status.bbfile_config_priorities.append((cre, pri)) | 605 | self.status.bbfile_config_priorities.append((c, regex, cre, pri)) |
598 | except ValueError: | 606 | except ValueError: |
599 | bb.msg.error(bb.msg.domain.Parsing, "invalid value for BBFILE_PRIORITY_%s: \"%s\"" % (c, priority)) | 607 | bb.msg.error(bb.msg.domain.Parsing, "invalid value for BBFILE_PRIORITY_%s: \"%s\"" % (c, priority)) |
600 | 608 | ||