mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

bitbake.conf: Add default FILESYSTEM_PERMS_TABLES

Browse Source 
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>
This commit is contained in:
Mark Hatle
2017-09-13 17:40:15 -05:00
committed by Richard Purdie
parent 6a05c7bf02
commit 5a386dcb48
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/package.bbclass
+1 -3
View File
@@ -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
meta/conf/bitbake.conf
+8
View File
@@ -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.
##################################################################