diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-02-05 21:12:50 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-15 12:17:15 +0000 |
| commit | fb87edc881009cf4d582cd95c248884551fe07fe (patch) | |
| tree | 0856a76c756d7dc408d97acbf491477503de8936 | |
| parent | 9b445cc39604223b0cfb21d28f748a86ff4cdf68 (diff) | |
| download | openembedded-core-fb87edc881009cf4d582cd95c248884551fe07fe.tar.gz openembedded-core-fb87edc881009cf4d582cd95c248884551fe07fe.tar.bz2 openembedded-core-fb87edc881009cf4d582cd95c248884551fe07fe.zip | |
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@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | 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 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) |