aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2016-11-22 15:39:31 +0800
committerChen Qi <Qi.Chen@windriver.com>2016-12-14 17:04:16 +0800
commit432f9a5147f555f2126976856cbbcfdaf2ae1385 (patch)
treedf24bc95c4f129af5dc0fed1646be24b20c66d61
parent31f2112c87dbc93868771592e5111f43bfbf964d (diff)
downloadopenembedded-core-contrib-432f9a5147f555f2126976856cbbcfdaf2ae1385.tar.gz
openembedded-core-contrib-432f9a5147f555f2126976856cbbcfdaf2ae1385.tar.bz2
openembedded-core-contrib-432f9a5147f555f2126976856cbbcfdaf2ae1385.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>
-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 533311061c5..c0654995b98 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
@@ -41,7 +41,7 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
${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"
@@ -52,7 +52,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 \