From 806aa2336c1a801b35265fee4eaa7c00161e4b20 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 12 Sep 2014 03:24:33 -0400 Subject: 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. Signed-off-by: Chen Qi --- meta/recipes-core/systemd/systemd_216.bb | 4 ++-- 1 file 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() { fi # Move libgudev back to ${rootlibdir} to keep backward compatibility - [ ${rootlibdir} != ${exec_prefix}/lib ] && mv -t ${D}${rootlibdir} ${D}${exec_prefix}/lib/libgudev* + [ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev* # Delete journal README, as log can be symlinked inside volatile. rm -f ${D}/${localstatedir}/log/README @@ -241,7 +241,7 @@ FILES_${PN} = " ${base_bindir}/* \ ${rootlibexecdir}/systemd/* \ ${systemd_unitdir}/* \ ${base_libdir}/security/*.so \ - ${exec_prefix}/lib/libnss_* \ + ${libdir}/libnss_* \ /cgroup \ ${bindir}/systemd* \ ${bindir}/busctl \ -- cgit 1.2.3-korg