[OE-core] [PATCH 1/3] sudo: handle libexecdir != libdir/PN.
Ross Burton
ross.burton at intel.com
Thu Dec 3 19:57:43 UTC 2015
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 at intel.com>
---
meta/recipes-extended/sudo/sudo.inc | 5 +++++
meta/recipes-extended/sudo/sudo_1.8.14p3.bb | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index a25876b..48ed436 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 b93112f..4db85e2 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"
--
2.1.4
More information about the Openembedded-core
mailing list