summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2019-07-24 17:36:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-26 08:41:02 +0100
commit2623d9d2f243128e50be9ed6fb5bb222b3fe9fa0 (patch)
tree235c090194ed962f3641a6bd6c808ca3debc7aee
parent9b6f880acb3a5f73bfbb045b58c068fd9515fda4 (diff)
downloadopenembedded-core-contrib-2623d9d2f243128e50be9ed6fb5bb222b3fe9fa0.tar.gz
openembedded-core-contrib-2623d9d2f243128e50be9ed6fb5bb222b3fe9fa0.tar.bz2
openembedded-core-contrib-2623d9d2f243128e50be9ed6fb5bb222b3fe9fa0.zip
sudo: use nonarch_libdir instead of libdir for tmpfiles.d
In case of multilib, /usr/lib64/tmpfiles.d is not a path that will be searched. So we need to use nonarch_libdir. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.27.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-extended/sudo/sudo_1.8.27.bb b/meta/recipes-extended/sudo/sudo_1.8.27.bb
index 4a34393026..1a3b2be6b4 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.27.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.27.bb
@@ -16,7 +16,7 @@ RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-l
EXTRA_OECONF += " \
ac_cv_type_rsize_t=no \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \
"
do_install_append () {
@@ -35,6 +35,6 @@ do_install_append () {
rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo
}
-FILES_${PN} += "${libdir}/tmpfiles.d"
+FILES_${PN} += "${nonarch_libdir}/tmpfiles.d"
FILES_${PN}-dev += "${libexecdir}/${BPN}/lib*${SOLIBSDEV} ${libexecdir}/${BPN}/*.la \
${libexecdir}/lib*${SOLIBSDEV} ${libexecdir}/*.la"