summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-09-15 10:05:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-16 22:14:08 +0100
commita6d390a8aae91b10e879b33cf823ff72e29b5499 (patch)
tree549ee8e68e0bb5c3724b7d1ef9018be6031f8452
parenta4cfa204bd58e234376da1e10a03decc6c105702 (diff)
downloadpoky-a6d390a8aae91b10e879b33cf823ff72e29b5499.tar.gz
systemd: fix to use ${libdir} for libraries
We need to use ${libdir} instead of ${exec_prefix}/lib for libraries. Otherwise, we would meet do_install errors if multilib is enabled. (From OE-Core rev: 6beeccb81416b0a7af6a4b19cb641f0d66a7198a) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_216.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb
index bd52891531..331da99479 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -129,7 +129,7 @@ do_install() {
129 fi 129 fi
130 130
131 # Move libgudev back to ${rootlibdir} to keep backward compatibility 131 # Move libgudev back to ${rootlibdir} to keep backward compatibility
132 [ ${rootlibdir} != ${exec_prefix}/lib ] && mv -t ${D}${rootlibdir} ${D}${exec_prefix}/lib/libgudev* 132 [ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev*
133 133
134 # Delete journal README, as log can be symlinked inside volatile. 134 # Delete journal README, as log can be symlinked inside volatile.
135 rm -f ${D}/${localstatedir}/log/README 135 rm -f ${D}/${localstatedir}/log/README
@@ -241,7 +241,7 @@ FILES_${PN} = " ${base_bindir}/* \
241 ${rootlibexecdir}/systemd/* \ 241 ${rootlibexecdir}/systemd/* \
242 ${systemd_unitdir}/* \ 242 ${systemd_unitdir}/* \
243 ${base_libdir}/security/*.so \ 243 ${base_libdir}/security/*.so \
244 ${exec_prefix}/lib/libnss_* \ 244 ${libdir}/libnss_* \
245 /cgroup \ 245 /cgroup \
246 ${bindir}/systemd* \ 246 ${bindir}/systemd* \
247 ${bindir}/busctl \ 247 ${bindir}/busctl \