aboutsummaryrefslogtreecommitdiffstats
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:12:30 +0100
commit6beeccb81416b0a7af6a4b19cb641f0d66a7198a (patch)
tree9e29c9714d4ee873e193e55113810466175644cc
parent9557bf88287216ff8cb98005cbc85b6928f4495c (diff)
downloadopenembedded-core-contrib-6beeccb81416b0a7af6a4b19cb641f0d66a7198a.tar.gz
openembedded-core-contrib-6beeccb81416b0a7af6a4b19cb641f0d66a7198a.tar.bz2
openembedded-core-contrib-6beeccb81416b0a7af6a4b19cb641f0d66a7198a.zip
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 <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 bd528915318..331da994795 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 \