From 2517f833dd5f6373ac42261a35bc1319eb5cc7b0 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Fri, 29 Nov 2013 15:19:11 +1000 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 1f494ee..b36ed6f 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -1486,7 +1486,7 @@ class CookerCollectFiles(object): filelist = [] f = os.path.basename(fn) for bbappend in self.appendlist: - if bbappend in f or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])): + if (bbappend == f) or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])): self.appliedappendlist.append(bbappend) for filename in self.appendlist[bbappend]: filelist.append(filename) -- 2.7.4