summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
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:39 +0100
commit0467421a6695923025285f55a2b128b0b9ad939f (patch)
tree99e0dd70a08e25d8238fde51cadc456d2c251314 /meta/recipes-extended
parentcbab455252967c9bd71be0645492a3804542bf14 (diff)
downloadpoky-0467421a6695923025285f55a2b128b0b9ad939f.tar.gz
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. (From OE-Core rev: 2623d9d2f243128e50be9ed6fb5bb222b3fe9fa0) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-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
16EXTRA_OECONF += " \ 16EXTRA_OECONF += " \
17 ac_cv_type_rsize_t=no \ 17 ac_cv_type_rsize_t=no \
18 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ 18 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \
19 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ 19 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \
20 " 20 "
21 21
22do_install_append () { 22do_install_append () {
@@ -35,6 +35,6 @@ do_install_append () {
35 rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo 35 rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo
36} 36}
37 37
38FILES_${PN} += "${libdir}/tmpfiles.d" 38FILES_${PN} += "${nonarch_libdir}/tmpfiles.d"
39FILES_${PN}-dev += "${libexecdir}/${BPN}/lib*${SOLIBSDEV} ${libexecdir}/${BPN}/*.la \ 39FILES_${PN}-dev += "${libexecdir}/${BPN}/lib*${SOLIBSDEV} ${libexecdir}/${BPN}/*.la \
40 ${libexecdir}/lib*${SOLIBSDEV} ${libexecdir}/*.la" 40 ${libexecdir}/lib*${SOLIBSDEV} ${libexecdir}/*.la"