From patchwork Thu Feb 14 17:52:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/3] package_ipk: check CONFFILES exist before adding them to metadata Date: Thu, 14 Feb 2013 17:52:50 -0000 From: Ross Burton X-Patchwork-Id: 44649 Message-Id: To: openembedded-core@lists.openembedded.org 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. Signed-off-by: Ross Burton --- meta/classes/package_ipk.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 () { 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)