summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
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:29 +0100
commit5a386dcb48f1b5629dcbb317e9107c8df5c27800 (patch)
tree2db67ba93c58f7491b9a51180c403dda04e13826 /meta/classes/package.bbclass
parent6a05c7bf02161e213ad6f0ab43033ede090b2466 (diff)
downloadpoky-5a386dcb48f1b5629dcbb317e9107c8df5c27800.tar.gz
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. (From OE-Core rev: b65736e1b7161619a0c5972376d3e713ccf53850) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass4
1 files changed, 1 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 () {
737 def get_fs_perms_list(d): 737 def get_fs_perms_list(d):
738 str = "" 738 str = ""
739 bbpath = d.getVar('BBPATH') 739 bbpath = d.getVar('BBPATH')
740 fs_perms_tables = d.getVar('FILESYSTEM_PERMS_TABLES') 740 fs_perms_tables = d.getVar('FILESYSTEM_PERMS_TABLES') or ""
741 if not fs_perms_tables:
742 fs_perms_tables = 'files/fs-perms.txt' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR', True)) else 'files/fs-perms-persistent-log.txt'
743 for conf_file in fs_perms_tables.split(): 741 for conf_file in fs_perms_tables.split():
744 str += " %s" % bb.utils.which(bbpath, conf_file) 742 str += " %s" % bb.utils.which(bbpath, conf_file)
745 return str 743 return str