summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2013-11-29 15:19:11 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-29 09:53:00 +0000
commitf91a3f46a1ee586e330be0868e8fbc4d2e78d361 (patch)
treea665126045a58007d6ea46e9b4d2746670447de3 /bitbake/lib
parent79fbb1f69815abd3b835678a8e4b9114f6f0290e (diff)
downloadpoky-f91a3f46a1ee586e330be0868e8fbc4d2e78d361.tar.gz
bitbake: cooker: Fix support for wildcards in bbappend filenames
The 'bbappend in f' incorrectly compares the current recipe with the avaliable bbappends recipes. This comparsion causes unrequested bbappend files to be appended, e.g. in the case of 'libgcc_4.8.bb', the bbappends for 'libgcc_4.8.bb' and 'gcc_4.8.bb' are added to the filelist (because 'gcc_4.8.bb' is contained in the 'libgcc_4.8.bb' string) which in turn causes the gcc_4.8.bbappend files to be appended to the libgcc_4.8 recipe. This should be a 'bbappend == f' to match the previous implementation of this function, such that if no wildcard is present the recipe names must match exactly. This issue was introduced by commit 31bc9af9cd56e7b318924869970e850993fafc5f, which it related to [YOCTO #5411]. (Bitbake rev: 991cbeedbde8bd25ce08c669b1bfac8b99e33149) Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/cooker.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 1f494ee657..b36ed6fe36 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1486,7 +1486,7 @@ class CookerCollectFiles(object):
1486 filelist = [] 1486 filelist = []
1487 f = os.path.basename(fn) 1487 f = os.path.basename(fn)
1488 for bbappend in self.appendlist: 1488 for bbappend in self.appendlist:
1489 if bbappend in f or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])): 1489 if (bbappend == f) or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])):
1490 self.appliedappendlist.append(bbappend) 1490 self.appliedappendlist.append(bbappend)
1491 for filename in self.appendlist[bbappend]: 1491 for filename in self.appendlist[bbappend]:
1492 filelist.append(filename) 1492 filelist.append(filename)