summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2017-09-13 17:40:15 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-18 11:07:22 +0100
commitb65736e1b7161619a0c5972376d3e713ccf53850 (patch)
treeede5bd3e8a1a499297bf93a447ff0e375498f822
parent1afcd46dba3582bc16909a24354514354d55870c (diff)
downloadopenembedded-core-contrib-b65736e1b7161619a0c5972376d3e713ccf53850.tar.gz
openembedded-core-contrib-b65736e1b7161619a0c5972376d3e713ccf53850.tar.bz2
openembedded-core-contrib-b65736e1b7161619a0c5972376d3e713ccf53850.zip
bitbake.conf: Add default FILESYSTEM_PERMS_TABLES
If FILESYSTEM_PERMS_TABLES was not defined, the default was selected by the packages.bbclass. This made it difficult for a recipe or layer to 'append' to the default. Copy the default into the bitbake.conf, allowing future _append and += style actions. Default was remove from package.bbclass. If a value is not set, only the built-in perms fixes will be used. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/package.bbclass4
-rw-r--r--meta/conf/bitbake.conf8
2 files changed, 9 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 7a62181456..2053d46395 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -737,9 +737,7 @@ python fixup_perms () {
def get_fs_perms_list(d):
str = ""
bbpath = d.getVar('BBPATH')
- fs_perms_tables = d.getVar('FILESYSTEM_PERMS_TABLES')
- if not fs_perms_tables:
- fs_perms_tables = 'files/fs-perms.txt' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR', True)) else 'files/fs-perms-persistent-log.txt'
+ fs_perms_tables = d.getVar('FILESYSTEM_PERMS_TABLES') or ""
for conf_file in fs_perms_tables.split():
str += " %s" % bb.utils.which(bbpath, conf_file)
return str
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 444c53f677..8fb596e6b9 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -330,6 +330,14 @@ FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE', False))}"
# This default was only used for checking
FILESEXTRAPATHS ?= "__default:"
+# The default list of fs-perms files to process. If the list is empty only
+# the builtin definitions will be used. Builtin definitions included:
+# base_prefix, prefix, exec_prefix, base_bindir, base_sbindir, base_libdir,
+# datadir, sysconfdir, servicedir, sharedstatedir, localstatedir, infodir,
+# mandir, docdir, bindir, sbindir, libexecdir, libdir, includedir and
+# oldincludedir
+FILESYSTEM_PERMS_TABLES ?= "${@'files/fs-perms.txt' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR', True)) else 'files/fs-perms-persistent-log.txt'}"
+
##################################################################
# General work and output directories for the build system.
##################################################################