diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2017-08-16 19:57:16 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-18 10:40:26 +0100 |
commit | a2ec15f20c10ea42a5f6247dafc1d0ffbab68a22 (patch) | |
tree | 2ca15e023b4bdb369d67767c7a26e3b3d5d0a283 | |
parent | 6ba3e68ee81b1fcdeb642056664212d36b90e1c7 (diff) | |
download | poky-a2ec15f20c10ea42a5f6247dafc1d0ffbab68a22.tar.gz |
base-files: respect VOLATILE_LOG_DIR
Respect VOLATILE_LOG_DIR variable. In this way, if the user overrides
this variable to be any valid boolean false value, /var/log on the final
image would reside on persistent storage.
[YOCTO #6132]
(From OE-Core rev: fc19114ca409fc3178ae5cbb44db875b12eeedfc)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/base-files/base-files_3.0.14.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index ca7bf06353..1c0863b1c7 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb | |||
@@ -42,7 +42,7 @@ dirs755 = "/boot /dev ${base_bindir} ${base_sbindir} ${base_libdir} \ | |||
42 | ${localstatedir}/backups ${localstatedir}/lib \ | 42 | ${localstatedir}/backups ${localstatedir}/lib \ |
43 | /sys ${localstatedir}/lib/misc ${localstatedir}/spool \ | 43 | /sys ${localstatedir}/lib/misc ${localstatedir}/spool \ |
44 | ${localstatedir}/volatile \ | 44 | ${localstatedir}/volatile \ |
45 | ${localstatedir}/volatile/log \ | 45 | ${localstatedir}/${@'volatile/' if oe.types.boolean('${VOLATILE_LOG_DIR}') else ''}log \ |
46 | /home ${prefix}/src ${localstatedir}/local \ | 46 | /home ${prefix}/src ${localstatedir}/local \ |
47 | /media" | 47 | /media" |
48 | 48 | ||
@@ -53,7 +53,7 @@ dirs755-lsb = "/srv \ | |||
53 | ${prefix}/lib/locale" | 53 | ${prefix}/lib/locale" |
54 | dirs2775-lsb = "/var/mail" | 54 | dirs2775-lsb = "/var/mail" |
55 | 55 | ||
56 | volatiles = "log tmp" | 56 | volatiles = "${@'log' if oe.types.boolean('${VOLATILE_LOG_DIR}') else ''} tmp" |
57 | conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ | 57 | conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ |
58 | ${sysconfdir}/issue /${sysconfdir}/issue.net \ | 58 | ${sysconfdir}/issue /${sysconfdir}/issue.net \ |
59 | ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ | 59 | ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ |