summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2017-04-27 14:00:25 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2017-04-28 10:10:41 +0200
commite7ad92decb7025d76e2e8b2bc15349d548c8ad14 (patch)
tree300e8e86408e452ce672f36ee5ad4f467a9baf30
parent51fbd3cf7db14399bc1c69c4a5fd63f157fd209d (diff)
downloadmeta-openembedded-e7ad92decb7025d76e2e8b2bc15349d548c8ad14.tar.gz
evince: fix do_install problem
When building evince for multilib, we would meet the following do_install error. mv: cannot stat [snip]/usr/lib64/systemd/user/evince.service: No such file or directory Fix to use the correct directory related to systemd in do_install function. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-gnome/recipes-gnome/evince/evince_3.24.0.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb b/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb
index 2b75244fe..aae8e719a 100644
--- a/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb
@@ -30,12 +30,13 @@ do_install_append() {
30 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)} 30 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}
31 then 31 then
32 install -d ${D}${systemd_unitdir}/system 32 install -d ${D}${systemd_unitdir}/system
33 mv ${D}${libdir}/systemd/user/evince.service ${D}${systemd_unitdir}/system/evince.service 33 mv ${D}${systemd_user_unitdir}/evince.service ${D}${systemd_system_unitdir}/evince.service
34 else 34 else
35 rm -rf ${D}${libdir}/systemd/user/evince.service 35 rm -rf ${D}${libdir}/systemd/user/evince.service
36 fi 36 fi
37 rmdir --ignore-fail-on-non-empty ${D}${libdir}/systemd/user 37 rmdir --ignore-fail-on-non-empty ${D}${systemd_user_unitdir}
38 rmdir --ignore-fail-on-non-empty ${D}${libdir}/systemd 38 rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd
39 rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}
39} 40}
40 41
41PACKAGECONFIG ??= "" 42PACKAGECONFIG ??= ""