summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-05-15 11:32:21 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-17 21:13:11 +0100
commitb7c1ac86909b1479434048c3e1d013d6efd9eac8 (patch)
tree8567280be566717f67e3d49ab74a17f851c17381 /meta/recipes-kernel
parent64a595286d7c6b6bb912de5b3e26abfa21e147ed (diff)
downloadpoky-b7c1ac86909b1479434048c3e1d013d6efd9eac8.tar.gz
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. (From OE-Core rev: 7163ebd92a799b8f000b2b6f303b20de468b5f90) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/kmod/kmod_git.bb4
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 d9c4d8b525..fd38d87978 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -3,7 +3,7 @@
3 3
4require kmod.inc 4require kmod.inc
5 5
6PR = "${INC_PR}.1" 6PR = "${INC_PR}.2"
7 7
8PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 8PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
9RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 9RPROVIDES_${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
16# autotools set prefix to /usr, however we want them in /bin and /sbin 16# autotools set prefix to /usr, however we want them in /bin and /sbin
17bindir = "${base_bindir}" 17bindir = "${base_bindir}"
18sbindir = "${base_sbindir}" 18sbindir = "${base_sbindir}"
19libdir = "${base_libdir}" 19# libdir = "${base_libdir}"
20 20
21do_install_append () { 21do_install_append () {
22 install -dm755 ${D}${base_bindir} 22 install -dm755 ${D}${base_bindir}