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 <ross.burton@intel.com>

diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index a25876b7fc52b6eb4040cc36603133d3a08936a5..48ed4362d914f87ac0b8d21bae5e18381bf9399e 100644 (file)
--- 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 b93112fa3fd1d77e14c1d393593bfd6db22f4819..4db85e23f8231fdd798f169d502d158ee3b66572 100644 (file)
--- 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"