summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_rpm.bbclass
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-02-17 10:08:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-19 07:51:38 +0000
commit0aa5ea125181364ddb7de67cc3f006f1d3926dd3 (patch)
treedb8268b242991bdb8b7c5642d6d490c895b1a808 /meta/classes/package_rpm.bbclass
parentc4cc479beb5970672f52f80ce5f77376d58861bc (diff)
downloadpoky-0aa5ea125181364ddb7de67cc3f006f1d3926dd3.tar.gz
packaging: allow globs in CONFFILES
Allow globs in CONFFILES. This patch changes the way of CONFFILES handling. After this change, the CONFFILES can take the same form as FILES. That means, we don't have to list a bunch of files for CONFFILES. It will just be expanded like the FILES variable. We don't assume default value for CONFFILES in OE. But distro vendors could provide a default value for CONFFILES in their distro configuration file like below. CONFFILES = "${sysconfdir}" In this way, files under /etc are treated as configuration files by default. Of course, setting CONFFILES in recipes take precedence over the CONFFILES. For example, if the recipe author decides that package A should only treat files under ${sysconfdir}/default/ as config files, he/she can write like this. CONFFILES_A = "${sysconfdir}/default" [YOCTO #5200] (From OE-Core rev: 0d446ef0e5bbca7058eec7259e34f2a1637dfab1) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 92ddf7a30f..b87e634f1b 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -324,7 +324,7 @@ python write_specfile () {
324 324
325 bb.data.update_data(localdata) 325 bb.data.update_data(localdata)
326 326
327 conffiles = (localdata.getVar('CONFFILES', True) or "").split() 327 conffiles = get_conffiles(pkg, d)
328 dirfiles = localdata.getVar('DIRFILES', True) 328 dirfiles = localdata.getVar('DIRFILES', True)
329 if dirfiles is not None: 329 if dirfiles is not None:
330 dirfiles = dirfiles.split() 330 dirfiles = dirfiles.split()