[oe-commits] Ross Burton : package_ipk: check CONFFILES exist before adding them to metadata

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: fb87edc881009cf4d582cd95c248884551fe07fe
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=fb87edc881009cf4d582cd95c248884551fe07fe

Author: Ross Burton <ross.burton at intel.com>
Date:   Tue Feb  5 21:12:50 2013 +0000

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.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/package_ipk.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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)