Skip to contentSkip to conversation

sudo: use nonarch_libdir instead of libdir for tmpfiles.d

PATCH New Chen Qi 1 participant 1 message Jul 24, 2019

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 meta/recipes-extended/sudo/sudo_1.8.27.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/sudo/sudo_1.8.27.bb +2 -2
index 4a34393026..1a3b2be6b4 100644
@@ -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"
Signature · 1 line
2.17.1