From 70b731c6f0728e1f38311e54e1d28d0c3418d06c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 5 Feb 2013 21:12:50 +0000 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/package_ipk.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/classes/package_ipk.bbclass') diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index d735051f7d..e5e76ef278 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) -- cgit v1.2.3-54-g00ecf