summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2015-09-23 13:49:37 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-24 17:54:33 +0100
commit94184a0551d1b04f26b1c5f1b6f440ce2ebe7a8f (patch)
tree09182f067efb0fcab945b3ef1e99013a709d37cc /meta/recipes-core
parent179ee77bf155ed34e59dfe83b7df038d77b82fe3 (diff)
downloadpoky-94184a0551d1b04f26b1c5f1b6f440ce2ebe7a8f.tar.gz
systemd: fix tmpfiles location when multilib in use
Systemd's configuration files for creation, deletion and cleaning of volatile and temporary files are installed in /usr/lib even when multilib is in use (when /usr/lib64 is available). In this check the systemd.conf file will not be found if libdir is /usr/lib64 so we fix the path to match this file's installation path to look for it in ${exec_prefix}/lib (From OE-Core rev: c1ef36c2b3e3876cc166a9a5e153fc6f23b42b92) Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd_225.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb
index fd1a3f315a..ef8d297e02 100644
--- a/meta/recipes-core/systemd/systemd_225.bb
+++ b/meta/recipes-core/systemd/systemd_225.bb
@@ -189,8 +189,8 @@ do_install() {
189 sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf 189 sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf
190 # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it 190 # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it
191 # for existence else it fails 191 # for existence else it fails
192 if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then 192 if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then
193 ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)} 193 ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)}
194 fi 194 fi
195 install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install 195 install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install
196} 196}