summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2017-03-30 14:16:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-18 13:07:33 +0100
commit017b38fc783125a251004ffb14d1e7264b486a71 (patch)
treeeea59fce378eb66a692c3302a050aa2a9a56129e
parentbe54ac0ebdb6aac23d05fb806580a0ceb7e191dd (diff)
downloadpoky-017b38fc783125a251004ffb14d1e7264b486a71.tar.gz
volatile-binds: correct some errors reported by systemd
systemd-tmpfiles-setup will fail at boot, so we suppress the default versions of etc.conf and home.conf. We also make sure that /var/{cache,spool} and /srv are writeable if they exist. (From OE-Core rev: a7c6129a7c9c0c7e1b729e16a60b2ca704af3f97) Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/volatile-binds/volatile-binds.bb9
1 files changed, 9 insertions, 0 deletions
diff --git a/meta/recipes-core/volatile-binds/volatile-binds.bb b/meta/recipes-core/volatile-binds/volatile-binds.bb
index fee7275e32..130ab55f05 100644
--- a/meta/recipes-core/volatile-binds/volatile-binds.bb
+++ b/meta/recipes-core/volatile-binds/volatile-binds.bb
@@ -17,6 +17,9 @@ REQUIRED_DISTRO_FEATURES = "systemd"
17 17
18VOLATILE_BINDS ?= "\ 18VOLATILE_BINDS ?= "\
19 /var/volatile/lib /var/lib\n\ 19 /var/volatile/lib /var/lib\n\
20 /var/volatile/cache /var/cache\n\
21 /var/volatile/spool /var/spool\n\
22 /var/volatile/srv /srv\n\
20" 23"
21VOLATILE_BINDS[type] = "list" 24VOLATILE_BINDS[type] = "list"
22VOLATILE_BINDS[separator] = "\n" 25VOLATILE_BINDS[separator] = "\n"
@@ -67,5 +70,11 @@ do_install () {
67 for service in ${SYSTEMD_SERVICE_volatile-binds}; do 70 for service in ${SYSTEMD_SERVICE_volatile-binds}; do
68 install -m 0644 $service ${D}${systemd_unitdir}/system/ 71 install -m 0644 $service ${D}${systemd_unitdir}/system/
69 done 72 done
73
74 # Suppress attempts to process some tmpfiles that are not temporary.
75 #
76 install -d ${D}${sysconfdir}/tmpfiles.d ${D}/var/cache
77 ln -s /dev/null ${D}${sysconfdir}/tmpfiles.d/etc.conf
78 ln -s /dev/null ${D}${sysconfdir}/tmpfiles.d/home.conf
70} 79}
71do_install[dirs] = "${WORKDIR}" 80do_install[dirs] = "${WORKDIR}"