[oe-commits] Koen Kooi : Revert "kmod: Use base_libdir for installing libkmod"

git at git.openembedded.org git at git.openembedded.org
Thu May 17 20:20:58 UTC 2012


Module: openembedded-core.git
Branch: master
Commit: 7163ebd92a799b8f000b2b6f303b20de468b5f90
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7163ebd92a799b8f000b2b6f303b20de468b5f90

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Tue May 15 11:32:21 2012 +0200

Revert "kmod: Use base_libdir for installing libkmod"

The commit breaks pkgconfig and after discussing it with the kmod and udev maintainers the conclusion was reached that putting the libraries in /lib instead of /usr/lib is not supported.

This reverts commit 6b74f2461735272bd950a4f060dab6e778a36f92.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-kernel/kmod/kmod_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index d9c4d8b..fd38d87 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -3,7 +3,7 @@
 
 require kmod.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
 RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
@@ -16,7 +16,7 @@ RCONFLICTS_libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod
 # autotools set prefix to /usr, however we want them in /bin and /sbin
 bindir = "${base_bindir}"
 sbindir = "${base_sbindir}"
-libdir = "${base_libdir}"
+# libdir = "${base_libdir}"
 
 do_install_append () {
         install -dm755 ${D}${base_bindir}





More information about the Openembedded-commits mailing list