diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-09-12 03:24:33 -0400 |
---|---|---|
committer | Chen Qi <Qi.Chen@windriver.com> | 2014-09-15 10:00:39 +0800 |
commit | 806aa2336c1a801b35265fee4eaa7c00161e4b20 (patch) | |
tree | f86f41fe2aacf0fef52e0902ba2c1291a465f471 | |
parent | 10df0718d6a626d99beb68cde8d914ee0820d7eb (diff) | |
download | openembedded-core-contrib-ChenQi/systemd-libdir.tar.gz |
systemd: fix to use ${libdir} for librariesChenQi/systemd-libdir
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 <Qi.Chen@windriver.com>
-rw-r--r-- | meta/recipes-core/systemd/systemd_216.bb | 4 |
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() { 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 \ |