From 431ad7a268fc07c367ce830c4f69dba515f44b4e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 23 Jun 2015 12:10:22 +0100 Subject: sudo: handle libexecdir != libdir/PN. sudo has somewhat special file installation logic and installs the modules and libraries to $libexecdir/sudo, with special handling for the case when libexecdir already contains /sudo (which it does by default in current oe-core where libexecdir=$libdir/$PN). As setting libexecdir to /usr/libexec should work, add both possibilities to FILES to be sure the right files are captured, and add INSANE_SKIP for the libdir warning that libraries are outside of /usr/lib/ (arguably, this should be fixed in insane). Signed-off-by: Ross Burton --- meta/recipes-extended/sudo/sudo.inc | 5 +++++ meta/recipes-extended/sudo/sudo_1.8.14p3.bb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index a25876b7fc..48ed4362d9 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -38,3 +38,8 @@ do_compile_prepend () { do_install_prepend (){ mkdir -p ${D}/${localstatedir}/lib } + +# Sudo insists on putting libraries into libexecdir +INSANE_SKIP_${PN} += "libdir" +INSANE_SKIP_${PN}-dev += "libdir" +INSANE_SKIP_${PN}-dbg += "libdir" diff --git a/meta/recipes-extended/sudo/sudo_1.8.14p3.bb b/meta/recipes-extended/sudo/sudo_1.8.14p3.bb index b93112fa3f..4db85e23f8 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.14p3.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.14p3.bb @@ -33,4 +33,5 @@ do_install_append () { } FILES_${PN} += "${libdir}/tmpfiles.d" -FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la" +FILES_${PN}-dev += "${libexecdir}/${BPN}/lib*${SOLIBSDEV} ${libexecdir}/${BPN}/*.la \ + ${libexecdir}/lib*${SOLIBSDEV} ${libexecdir}/*.la" -- cgit 1.2.3-korg