From 5aa29c45e9ace0826705fc81f4a5cc664d5d6ba0 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 1 Dec 2014 13:49:25 +0800 Subject: 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] Signed-off-by: Chen Qi --- meta/classes/package.bbclass | 79 +++++++++++++++++++++++++++++++--------- meta/classes/package_deb.bbclass | 2 +- meta/classes/package_ipk.bbclass | 2 +- meta/classes/package_rpm.bbclass | 2 +- 4 files changed, 64 insertions(+), 21 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index f6c92cb620..9f64ed77e5 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -239,6 +239,66 @@ python () { d.appendVarFlag('do_package', 'deptask', " do_packagedata") } +# Get a list of files from file vars by searching files under current working directory +# The list contains symlinks, directories and normal files. +def files_from_filevars(filevars): + import os,glob + cpath = oe.cachedpath.CachedPath() + files = [] + for f in filevars: + if os.path.isabs(f): + f = '.' + f + if not f.startswith("./"): + f = './' + f + globbed = glob.glob(f) + if globbed: + if [ f ] != globbed: + files += globbed + continue + files.append(f) + + for f in files: + if not cpath.islink(f): + if cpath.isdir(f): + newfiles = [ os.path.join(f,x) for x in os.listdir(f) ] + if newfiles: + files += newfiles + + return files + +# Called in package_.bbclass to get the correct list of configuration files +def get_conffiles(pkg, d): + pkgdest = d.getVar('PKGDEST', True) + root = os.path.join(pkgdest, pkg) + cwd = os.getcwd() + os.chdir(root) + + conffiles = d.getVar('CONFFILES_%s' % pkg, True); + if conffiles == None: + conffiles = d.getVar('CONFFILES', True) + if conffiles == None: + conffiles = "" + conffiles = conffiles.split() + conf_orig_list = files_from_filevars(conffiles) + + # Remove links and directories from conf_orig_list to get conf_list which only contains normal files + conf_list = [] + for f in conf_orig_list: + if os.path.isdir(f): + continue + if os.path.islink(f): + continue + if not os.path.exists(f): + continue + conf_list.append(f) + + # Remove the leading './' + for i in range(0, len(conf_list)): + conf_list[i] = conf_list[i][1:] + + os.chdir(cwd) + return conf_list + def splitdebuginfo(file, debugfile, debugsrcdir, sourcefile, d): # Function to split a single file into two components, one is the stripped # target system binary, the other contains any debugging information. The @@ -1009,26 +1069,9 @@ python populate_packages () { filesvar.replace("//", "/") origfiles = filesvar.split() - files = [] - for file in origfiles: - if os.path.isabs(file): - file = '.' + file - if not file.startswith("./"): - file = './' + file - globbed = glob.glob(file) - if globbed: - if [ file ] != globbed: - files += globbed - continue - files.append(file) + files = files_from_filevars(origfiles) for file in files: - if not cpath.islink(file): - if cpath.isdir(file): - newfiles = [ os.path.join(file,x) for x in os.listdir(file) ] - if newfiles: - files += newfiles - continue if (not cpath.islink(file)) and (not cpath.exists(file)): continue if file in seen: 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 () { scriptfile.close() os.chmod(os.path.join(controldir, script), 0755) - conffiles_str = localdata.getVar("CONFFILES", True) + conffiles_str = ' '.join(get_conffiles(pkg, d)) if conffiles_str: try: conffiles = open(os.path.join(controldir, 'conffiles'), 'w') diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 44fd3eb29c..dba68042ac 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -226,7 +226,7 @@ python do_package_ipk () { scriptfile.close() os.chmod(os.path.join(controldir, script), 0755) - conffiles_str = localdata.getVar("CONFFILES", True) + conffiles_str = ' '.join(get_conffiles(pkg, d)) if conffiles_str: try: conffiles = open(os.path.join(controldir, 'conffiles'), 'w') 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 () { bb.data.update_data(localdata) - conffiles = (localdata.getVar('CONFFILES', True) or "").split() + conffiles = get_conffiles(pkg, d) dirfiles = localdata.getVar('DIRFILES', True) if dirfiles is not None: dirfiles = dirfiles.split() -- cgit 1.2.3-korg