summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-02-05 21:12:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-15 12:17:35 (GMT)
commit70b731c6f0728e1f38311e54e1d28d0c3418d06c (patch)
tree5e46b5864e2ca57e035995afa2a2bf1365d464a1
parenta9608dd3e5d32a784c13d2b379d36b9046226172 (diff)
downloadpoky-70b731c6f0728e1f38311e54e1d28d0c3418d06c.tar.gz
package_ipk: check CONFFILES exist before adding them to metadata
opkg-build verifies that conffiles exist, so verify that the specified files actually exist before writing them to conffiles. This mirrors the behaviour of FILES and package_rpm's CONFFILES handling. (From OE-Core rev: fb87edc881009cf4d582cd95c248884551fe07fe) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_ipk.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index d735051..e5e76ef 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -440,7 +440,8 @@ python do_package_ipk () {
440 bb.utils.unlockfile(lf) 440 bb.utils.unlockfile(lf)
441 raise bb.build.FuncFailed("unable to open conffiles for writing.") 441 raise bb.build.FuncFailed("unable to open conffiles for writing.")
442 for f in conffiles_str.split(): 442 for f in conffiles_str.split():
443 conffiles.write('%s\n' % f) 443 if os.path.exists(oe.path.join(root, f)):
444 conffiles.write('%s\n' % f)
444 conffiles.close() 445 conffiles.close()
445 446
446 os.chdir(basedir) 447 os.chdir(basedir)