diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2015-02-17 10:08:12 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-19 07:51:38 +0000 |
commit | 0aa5ea125181364ddb7de67cc3f006f1d3926dd3 (patch) | |
tree | db8268b242991bdb8b7c5642d6d490c895b1a808 /meta/classes/package_deb.bbclass | |
parent | c4cc479beb5970672f52f80ce5f77376d58861bc (diff) | |
download | poky-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_deb.bbclass')
-rw-r--r-- | meta/classes/package_deb.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 5b5f7e2c9a..9d7c59ba53 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
@@ -262,7 +262,7 @@ python do_package_deb () { | |||
262 | scriptfile.close() | 262 | scriptfile.close() |
263 | os.chmod(os.path.join(controldir, script), 0755) | 263 | os.chmod(os.path.join(controldir, script), 0755) |
264 | 264 | ||
265 | conffiles_str = localdata.getVar("CONFFILES", True) | 265 | conffiles_str = ' '.join(get_conffiles(pkg, d)) |
266 | if conffiles_str: | 266 | if conffiles_str: |
267 | try: | 267 | try: |
268 | conffiles = open(os.path.join(controldir, 'conffiles'), 'w') | 268 | conffiles = open(os.path.join(controldir, 'conffiles'), 'w') |