diff options
Diffstat (limited to 'meta/recipes-extended/sudo/sudo_1.9.3p1.bb')
| -rw-r--r-- | meta/recipes-extended/sudo/sudo_1.9.3p1.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-extended/sudo/sudo_1.9.3p1.bb b/meta/recipes-extended/sudo/sudo_1.9.3p1.bb index 08a0fa03a3..ba61a7f247 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.3p1.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.3p1.bb @@ -2,6 +2,7 @@ require sudo.inc SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \ " PAM_SRC_URI = "file://sudo.pam" @@ -24,6 +25,7 @@ EXTRA_OECONF += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ --with-rundir=/run/sudo \ --with-vardir=/var/lib/sudo \ + --libexecdir=${libdir} \ " do_install_append () { @@ -43,5 +45,5 @@ do_install_append () { } FILES_${PN} += "${nonarch_libdir}/tmpfiles.d" -FILES_${PN}-dev += "${libexecdir}/${BPN}/lib*${SOLIBSDEV} ${libexecdir}/${BPN}/*.la \ - ${libexecdir}/lib*${SOLIBSDEV} ${libexecdir}/*.la" +FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la \ + ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" |