summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-06-23 12:10:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 10:20:50 +0000
commitd0577f99606c061ac7539ac51897e6e6442d1144 (patch)
treef0d260c6df895b53b1dccc3da1a0c51d7df11114 /meta/recipes-extended
parent6f837cc142ccad39856cb846a205a2999658b16e (diff)
downloadpoky-d0577f99606c061ac7539ac51897e6e6442d1144.tar.gz
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). (From OE-Core rev: 431ad7a268fc07c367ce830c4f69dba515f44b4e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/sudo/sudo.inc5
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.14p3.bb3
2 files changed, 7 insertions, 1 deletions
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 () {
38do_install_prepend (){ 38do_install_prepend (){
39 mkdir -p ${D}/${localstatedir}/lib 39 mkdir -p ${D}/${localstatedir}/lib
40} 40}
41
42# Sudo insists on putting libraries into libexecdir
43INSANE_SKIP_${PN} += "libdir"
44INSANE_SKIP_${PN}-dev += "libdir"
45INSANE_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 () {
33} 33}
34 34
35FILES_${PN} += "${libdir}/tmpfiles.d" 35FILES_${PN} += "${libdir}/tmpfiles.d"
36FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la" 36FILES_${PN}-dev += "${libexecdir}/${BPN}/lib*${SOLIBSDEV} ${libexecdir}/${BPN}/*.la \
37 ${libexecdir}/lib*${SOLIBSDEV} ${libexecdir}/*.la"