From f017eb38bbca4af106ed359adfbbd4bfdf9bad5c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 15 Feb 2013 13:03:51 +0000 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/package_deb.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/classes/package_deb.bbclass') 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) -- cgit v1.2.3-54-g00ecf