summaryrefslogtreecommitdiffstats
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:22 -0800
commitf017eb38bbca4af106ed359adfbbd4bfdf9bad5c (patch)
tree9ad2bdcfccf529ebab8185c983128d8bc648af17
parentb1c887277c67a9a0fb08162edc4cc9aeeb8f400d (diff)
downloadpoky-f017eb38bbca4af106ed359adfbbd4bfdf9bad5c.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. (From OE-Core rev: 767a3d1c45f97add720174a7034df750bfb09a8e) 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_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 () {
365 bb.utils.unlockfile(lf) 365 bb.utils.unlockfile(lf)
366 raise bb.build.FuncFailed("unable to open conffiles for writing.") 366 raise bb.build.FuncFailed("unable to open conffiles for writing.")
367 for f in conffiles_str.split(): 367 for f in conffiles_str.split():
368 conffiles.write('%s\n' % f) 368 if os.path.exists(oe.path.join(root, f)):
369 conffiles.write('%s\n' % f)
369 conffiles.close() 370 conffiles.close()
370 371
371 os.chdir(basedir) 372 os.chdir(basedir)