aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-09-27 10:01:49 -0700
committerChris Larson <chris_larson@mentor.com>2010-09-27 10:02:59 -0700
commit25a0253a1f2d5240ad6e1992fd812fd52958c523 (patch)
tree7b18546367940a1b0e3204ff421d82b62b981b22
parent8e17c351d7412a8cbc98a7bba6a2cad15a82963a (diff)
downloadopenembedded-25a0253a1f2d5240ad6e1992fd812fd52958c523.tar.gz
openembedded-25a0253a1f2d5240ad6e1992fd812fd52958c523.tar.bz2
openembedded-25a0253a1f2d5240ad6e1992fd812fd52958c523.zip
amend.bbclass: kill override specific
Signed-off-by: Chris Larson <chris_larson@mentor.com>
-rw-r--r--classes/amend.bbclass28
1 files changed, 14 insertions, 14 deletions
diff --git a/classes/amend.bbclass b/classes/amend.bbclass
index 2d928286b3..a03de640f1 100644
--- a/classes/amend.bbclass
+++ b/classes/amend.bbclass
@@ -10,23 +10,23 @@
python () {
import bb, os
- filespath = d.getVar("FILESPATH", 1).split(":")
- amendfiles = [os.path.join(fpath, "amend.inc")
- for fpath in filespath]
-
- newdata = []
seen = set()
- for file in amendfiles:
- if file in seen:
- continue
- seen.add(file)
+ def __amendfiles():
+ for base in d.getVar("FILESPATHBASE", True).split(":"):
+ for pkg in d.getVar("FILESPATHPKG", True).split(":"):
+ path = os.path.join(base, pkg, "amend.inc")
+ if path not in seen:
+ seen.add(path)
+ yield path
- if os.path.exists(file):
- bb.parse.handle(file, d, 1)
+ newdata = []
+ for amend in __amendfiles():
+ if os.path.exists(amend):
+ bb.parse.handle(amend, d, 1)
else:
- # Manually add amend.inc files that don't exist to the __depends, to
- # ensure that creating them invalidates the bitbake cache for that recipe.
- newdata.append((file, 0))
+ # Manually add amend.inc files that don't exist to the __depends,
+ # to ensure that creating them invalidates the bitbake cache
+ newdata.append((amend, 0))
if not newdata:
return