summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2017-08-16 19:57:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 10:40:26 +0100
commit3920d199edc071122a217e6a393a2914fcbc1e22 (patch)
treefea1cf7e5f96d133c315a887f4f8bd9fba98879a /meta
parent8c69b6ab8573ff5308c93691599f13810d338755 (diff)
downloadpoky-3920d199edc071122a217e6a393a2914fcbc1e22.tar.gz
package.bbclass: support persistent /var/log
Add a new file, fs-perms-persistent-log.txt, which treats /var/log as a directory instead of a link. Modify package.bbclass to use this file if VOLATILE_LOG_DIR is set to boolean false value. [YOCTO #6132] (From OE-Core rev: 6b22e247bf91f112401cad822cd7fe0b5621ffe0) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass2
-rw-r--r--meta/files/fs-perms-persistent-log.txt66
2 files changed, 67 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 2fe30dac0c..a051617ee1 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -739,7 +739,7 @@ python fixup_perms () {
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')
741 if not fs_perms_tables: 741 if not fs_perms_tables:
742 fs_perms_tables = 'files/fs-perms.txt' 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(): 743 for conf_file in fs_perms_tables.split():
744 str += " %s" % bb.utils.which(bbpath, conf_file) 744 str += " %s" % bb.utils.which(bbpath, conf_file)
745 return str 745 return str
diff --git a/meta/files/fs-perms-persistent-log.txt b/meta/files/fs-perms-persistent-log.txt
new file mode 100644
index 0000000000..3a7cf3ab94
--- /dev/null
+++ b/meta/files/fs-perms-persistent-log.txt
@@ -0,0 +1,66 @@
1# This file contains a list of files and directories with known permissions.
2# It is used by the packaging class to ensure that the permissions, owners and
3# group of listed files and directories are in sync across the system.
4#
5# The format of this file
6#
7#<path> <mode> <uid> <gid> <walk> <fmode> <fuid> <fgid>
8#
9# or
10#
11#<path> link <target>
12#
13# <path>: directory path
14# <mode>: mode for directory
15# <uid>: uid for directory
16# <gid>: gid for directory
17# <walk>: recursively walk the directory? true or false
18# <fmode>: if walking, new mode for files
19# <fuid>: if walking, new uid for files
20# <fgid>: if walking, new gid for files
21# <target>: turn the directory into a symlink point to target
22#
23# in mode, uid or gid, a "-" means don't change any existing values
24#
25# /usr/src 0755 root root false - - -
26# /usr/share/man 0755 root root true 0644 root root
27
28# Note: all standard config directories are automatically assigned "0755 root root false - - -"
29
30# Documentation should always be corrected
31${mandir} 0755 root root true 0644 root root
32${infodir} 0755 root root true 0644 root root
33${docdir} 0755 root root true 0644 root root
34${datadir}/gtk-doc 0755 root root true 0644 root root
35
36# Fixup locales
37${datadir}/locale 0755 root root true 0644 root root
38
39# Cleanup headers
40${includedir} 0755 root root true 0644 root root
41${oldincludedir} 0755 root root true 0644 root root
42
43# Cleanup debug src
44/usr/src/debug 0755 root root true - root root
45
46# Items from base-files
47# Links
48${localstatedir}/run link /run
49${localstatedir}/lock link /run/lock
50${localstatedir}/tmp link volatile/tmp
51
52/home 0755 root root false - - -
53/srv 0755 root root false - - -
54${prefix}/src 0755 root root false - - -
55${localstatedir}/local 0755 root root false - - -
56
57# Special permissions from base-files
58# Set 1777
59/tmp 01777 root root false - - -
60${localstatedir}/volatile/tmp 01777 root root false - - -
61
62# Set 0700
63${ROOT_HOME} 0700 root root false - - -
64
65# Set 2775-lsb
66${localstatedir}/mail 02775 root mail false - - -