summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-12-18 16:20:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-18 17:08:06 +0000
commit3d6d5d78479e5703180f5230cf24c335c20a4689 (patch)
tree17291fd9c42f7cd33fb11e88c7c3d649bdae549f /meta
parent402308cfe2ef7777342c2af807b494ac921e81d6 (diff)
downloadpoky-3d6d5d78479e5703180f5230cf24c335c20a4689.tar.gz
systemd: delete files that end up in /var/volatile
${localstatedir}/log/journal is created by tmpfiles.d on boot, and the README just causes warnings that /var/volatile isn't empty when mounting on top of it. (From OE-Core rev: dfcd8f2a6f5847d735755c1644c4c93be4fbb3e8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd_208.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb
index c1f8d773fb..372e73d8e0 100644
--- a/meta/recipes-core/systemd/systemd_208.bb
+++ b/meta/recipes-core/systemd/systemd_208.bb
@@ -97,9 +97,6 @@ do_install() {
97 ln -s ${rootlibexecdir}/systemd/systemd ${D}/init 97 ln -s ${rootlibexecdir}/systemd/systemd ${D}/init
98 ln -s ${rootlibexecdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd 98 ln -s ${rootlibexecdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd
99 99
100 # Create dir for journal
101 install -d ${D}${localstatedir}/log/journal
102
103 # Create machine-id 100 # Create machine-id
104 # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable 101 # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable
105 touch ${D}${sysconfdir}/machine-id 102 touch ${D}${sysconfdir}/machine-id
@@ -113,6 +110,9 @@ do_install() {
113 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd 110 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd
114 sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd 111 sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
115 fi 112 fi
113
114 # Delete journal README, as log can be symlinked inside volatile.
115 rm -f ${D}/${localstatedir}/log/README
116} 116}
117 117
118do_install_ptest () { 118do_install_ptest () {