summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/base-files
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2017-08-16 19:57:16 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-17 10:04:31 +0100
commitfc19114ca409fc3178ae5cbb44db875b12eeedfc (patch)
tree93181134f206b5d3613496b331e9b1ae647bba89 /meta/recipes-core/base-files
parent016bafce52f74462dc8f21a1c1b43ba2e6e59442 (diff)
downloadopenembedded-core-contrib-fc19114ca409fc3178ae5cbb44db875b12eeedfc.tar.gz
openembedded-core-contrib-fc19114ca409fc3178ae5cbb44db875b12eeedfc.tar.bz2
openembedded-core-contrib-fc19114ca409fc3178ae5cbb44db875b12eeedfc.zip
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] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/base-files')
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb4
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} \
${localstatedir}/backups ${localstatedir}/lib \
/sys ${localstatedir}/lib/misc ${localstatedir}/spool \
${localstatedir}/volatile \
- ${localstatedir}/volatile/log \
+ ${localstatedir}/${@'volatile/' if oe.types.boolean('${VOLATILE_LOG_DIR}') else ''}log \
/home ${prefix}/src ${localstatedir}/local \
/media"
@@ -53,7 +53,7 @@ dirs755-lsb = "/srv \
${prefix}/lib/locale"
dirs2775-lsb = "/var/mail"
-volatiles = "log tmp"
+volatiles = "${@'log' if oe.types.boolean('${VOLATILE_LOG_DIR}') else ''} tmp"
conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
${sysconfdir}/issue /${sysconfdir}/issue.net \
${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \