diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-10-10 09:49:44 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-18 15:49:56 +0100 |
commit | cd414c0d1cdf7a49bfe862b6c7678c19f38f5a18 (patch) | |
tree | d5c1746699f934d65a634aa4a2d231b230ef164d /meta/recipes-kernel/kmod/kmod_git.bb | |
parent | e83640d9dc1145c052ed235ba822afcc5dfe0d67 (diff) | |
download | poky-cd414c0d1cdf7a49bfe862b6c7678c19f38f5a18.tar.gz |
kmod: Update to Rev 15 via git
Also nail down a previously floating dependancy on zlib, which is required for ptest
(From OE-Core rev: e76181535fce8bd4bb63f55106de4d074cae4e06)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kmod/kmod_git.bb')
-rw-r--r-- | meta/recipes-kernel/kmod/kmod_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb index ebecbcc82e..f90b9aaec9 100644 --- a/meta/recipes-kernel/kmod/kmod_git.bb +++ b/meta/recipes-kernel/kmod/kmod_git.bb | |||
@@ -3,8 +3,6 @@ | |||
3 | 3 | ||
4 | require kmod.inc | 4 | require kmod.inc |
5 | 5 | ||
6 | PV_append = "+git${SRCPV}" | ||
7 | |||
8 | PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 6 | PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" |
9 | RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 7 | RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" |
10 | RCONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 8 | RCONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" |
@@ -34,6 +32,7 @@ do_install_append () { | |||
34 | 32 | ||
35 | # install depmod.d file for search/ dir | 33 | # install depmod.d file for search/ dir |
36 | install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf" | 34 | install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf" |
35 | |||
37 | } | 36 | } |
38 | 37 | ||
39 | do_compile_prepend() { | 38 | do_compile_prepend() { |
@@ -64,7 +63,8 @@ ALTERNATIVE_TARGET[lsmod] = "${base_bindir}/lsmod.${BPN}" | |||
64 | 63 | ||
65 | ALTERNATIVE_LINK_NAME[depmod] = "${base_sbindir}/depmod" | 64 | ALTERNATIVE_LINK_NAME[depmod] = "${base_sbindir}/depmod" |
66 | 65 | ||
67 | PACKAGES =+ "libkmod" | 66 | PACKAGES =+ "libkmod ${PN}-bash-completion" |
68 | 67 | ||
69 | FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}" | 68 | FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}" |
70 | FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d" | 69 | FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d" |
70 | FILES_${PN}-bash-completion = "${datadir}/bash-completion" | ||