summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJian Liu <jian.liu@windriver.com>2015-11-13 16:21:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-24 15:50:26 +0000
commit4415dc5cdda9a9ca18e5202309c1dadcb013b1dc (patch)
tree92eaf48ad1997a28f3b2ec319379c2e63cededb8 /meta
parent2f0ff3abb448dc23d9420986fcbab80c9da7cd25 (diff)
downloadpoky-4415dc5cdda9a9ca18e5202309c1dadcb013b1dc.tar.gz
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. (From OE-Core rev: 5c84057de5b31c5d6d9abfcca3078bf766a21d88) Signed-off-by: Jian Liu <jian.liu@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/archiver.bbclass10
1 files changed, 10 insertions, 0 deletions
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 () {
298 bb.utils.mkdirhier(outdir) 298 bb.utils.mkdirhier(outdir)
299 shutil.copy(bbfile, outdir) 299 shutil.copy(bbfile, outdir)
300 300
301 pn = d.getVar('PN', True)
302 bbappend_files = d.getVar('BBINCLUDED', True).split()
303 # If recipe name is aa, we need to match files like aa.bbappend and aa_1.1.bbappend
304 # Files like aa1.bbappend or aa1_1.1.bbappend must be excluded.
305 bbappend_re = re.compile( r".*/%s_[^/]*\.bbappend$" %pn)
306 bbappend_re1 = re.compile( r".*/%s\.bbappend$" %pn)
307 for file in bbappend_files:
308 if bbappend_re.match(file) or bbappend_re1.match(file):
309 shutil.copy(file, outdir)
310
301 dirname = os.path.dirname(bbfile) 311 dirname = os.path.dirname(bbfile)
302 bbpath = '%s:%s' % (dirname, d.getVar('BBPATH', True)) 312 bbpath = '%s:%s' % (dirname, d.getVar('BBPATH', True))
303 f = open(bbfile, 'r') 313 f = open(bbfile, 'r')