From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 28 Aug 2018 14:43:58 +0000 (+0200)
Subject: kmod: do not reset $bindir/sbindir, use EXTRA_OECONF instead
X-Git-Tag: uninative-2.3~515
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3d92bce5a8e021c03e509e8ee6ead064e97bfcec;p=openembedded-core.git

kmod: do not reset $bindir/sbindir, use EXTRA_OECONF instead

This was causing issues with classes that use $bindir to find
already installed binaries in rootfs (manpages class in particular).

$bindir needs to be the same for all recipes.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index 69185b2453..b25679359b 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -13,9 +13,7 @@ RREPLACES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod mod
 RCONFLICTS_libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
 
 # autotools set prefix to /usr, however we want them in /bin and /sbin
-bindir = "${base_bindir}"
-sbindir = "${base_sbindir}"
-# libdir = "${base_libdir}"
+EXTRA_OECONF += " --bindir=${base_bindir} --sbindir=${base_sbindir}"
 
 do_install_append () {
         install -dm755 ${D}${base_bindir}