From: Ross Burton <ross.burton@intel.com>
Date: Tue, 5 Feb 2013 21:12:50 +0000 (+0000)
Subject: package_ipk: check CONFFILES exist before adding them to metadata
X-Git-Tag: rev_ivi_2015_02_04~13669
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b49f9d0453432fd9b999fde05cdc45ccf77aece;p=scm%2Fbb%2Ftizen-distro.git

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 <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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)