From 5a386dcb48f1b5629dcbb317e9107c8df5c27800 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 13 Sep 2017 17:40:15 -0500 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'meta/classes/package.bbclass') 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 -- cgit v1.2.3-54-g00ecf