aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-02-15 13:03:51 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-22 06:09:13 -0800
commit767a3d1c45f97add720174a7034df750bfb09a8e (patch)
tree7567c06c3adf0b102ffb06e76a7cad325e72a57e
parent416519ec595f59ebeafb95bed2546635cad41559 (diff)
downloadopenembedded-core-contrib-767a3d1c45f97add720174a7034df750bfb09a8e.tar.gz
package_deb: check CONFFILES exist before adding them to metadata
dpkg-deb 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. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/classes/package_deb.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 12e01d1d5e..eea15e722f 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -365,7 +365,8 @@ python do_package_deb () {
bb.utils.unlockfile(lf)
raise bb.build.FuncFailed("unable to open conffiles for writing.")
for f in conffiles_str.split():
- conffiles.write('%s\n' % f)
+ if os.path.exists(oe.path.join(root, f)):
+ conffiles.write('%s\n' % f)
conffiles.close()
os.chdir(basedir)