From 5c84057de5b31c5d6d9abfcca3078bf766a21d88 Mon Sep 17 00:00:00 2001 From: Jian Liu Date: Fri, 13 Nov 2015 16:21:46 +0800 Subject: archiver.bbclass: add bbappend when do_ar_recipe kernel and gcc packages bbappend files are not included in the archiver during do_ar_recipe. Find and put them into the tarball. Signed-off-by: Jian Liu Signed-off-by: Ross Burton --- meta/classes/archiver.bbclass | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index d7a159dcd1..328e2ed11a 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -298,6 +298,16 @@ python do_ar_recipe () { bb.utils.mkdirhier(outdir) shutil.copy(bbfile, outdir) + pn = d.getVar('PN', True) + bbappend_files = d.getVar('BBINCLUDED', True).split() + # If recipe name is aa, we need to match files like aa.bbappend and aa_1.1.bbappend + # Files like aa1.bbappend or aa1_1.1.bbappend must be excluded. + bbappend_re = re.compile( r".*/%s_[^/]*\.bbappend$" %pn) + bbappend_re1 = re.compile( r".*/%s\.bbappend$" %pn) + for file in bbappend_files: + if bbappend_re.match(file) or bbappend_re1.match(file): + shutil.copy(file, outdir) + dirname = os.path.dirname(bbfile) bbpath = '%s:%s' % (dirname, d.getVar('BBPATH', True)) f = open(bbfile, 'r') -- cgit 1.2.3-korg