summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/kmod
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-10-10 09:49:44 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-18 15:49:56 +0100
commitcd414c0d1cdf7a49bfe862b6c7678c19f38f5a18 (patch)
treed5c1746699f934d65a634aa4a2d231b230ef164d /meta/recipes-kernel/kmod
parente83640d9dc1145c052ed235ba822afcc5dfe0d67 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-kernel/kmod/kmod-native_git.bb3
-rw-r--r--meta/recipes-kernel/kmod/kmod.inc12
-rw-r--r--meta/recipes-kernel/kmod/kmod_git.bb6
3 files changed, 10 insertions, 11 deletions
diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb
index d008cbf7c4..fccc39bb37 100644
--- a/meta/recipes-kernel/kmod/kmod-native_git.bb
+++ b/meta/recipes-kernel/kmod/kmod-native_git.bb
@@ -4,8 +4,7 @@
4require kmod.inc 4require kmod.inc
5inherit native 5inherit native
6 6
7SRC_URI += "file://fix-undefined-O_CLOEXEC.patch \ 7SRC_URI += "file://0001-Fix-build-with-older-gcc-4.6.patch \
8 file://0001-Fix-build-with-older-gcc-4.6.patch \
9 file://Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch \ 8 file://Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch \
10 " 9 "
11 10
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index 880a53aa07..8a18547c55 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -8,13 +8,17 @@ LICENSE = "GPL-2.0+ & LGPL-2.1+"
8LICENSE_libkmod = "LGPL-2.1+" 8LICENSE_libkmod = "LGPL-2.1+"
9SECTION = "base" 9SECTION = "base"
10 10
11DEPENDS += "pkgconfig-native" 11DEPENDS += "pkgconfig-native zlib"
12 12
13LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 13LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
14 file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 14 file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
15 " 15 "
16inherit autotools gtk-doc ptest 16inherit autotools gtk-doc ptest
17 17
18SRCREV = "18811d22e9923893555b88a482aa967db0e7892a"
19# Lookout for PV bump too when SRCREV is changed
20PV = "15+git${SRCPV}"
21
18SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ 22SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
19 file://depmod-search.conf \ 23 file://depmod-search.conf \
20 file://run-ptest \ 24 file://run-ptest \
@@ -23,14 +27,10 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
23 file://fix-seperatebuilddir.patch \ 27 file://fix-seperatebuilddir.patch \
24 " 28 "
25 29
26SRCREV = "3b38c7fcb58be4ddc34f90454c5f5dc3693d2d85"
27# Lookout for PV bump too when SRCREV is changed
28PV = "14"
29
30S = "${WORKDIR}/git" 30S = "${WORKDIR}/git"
31 31
32EXTRA_AUTORECONF += "--install --symlink" 32EXTRA_AUTORECONF += "--install --symlink"
33EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools --disable-manpages" 33EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools --disable-manpages --with-zlib"
34 34
35do_configure_prepend () { 35do_configure_prepend () {
36 gtkdocize --docdir ${S}/libkmod/docs || touch ${S}/libkmod/docs/gtk-doc.make 36 gtkdocize --docdir ${S}/libkmod/docs || touch ${S}/libkmod/docs/gtk-doc.make
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
4require kmod.inc 4require kmod.inc
5 5
6PV_append = "+git${SRCPV}"
7
8PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 6PROVIDES += "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" 7RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
10RCONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 8RCONFLICTS_${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
39do_compile_prepend() { 38do_compile_prepend() {
@@ -64,7 +63,8 @@ ALTERNATIVE_TARGET[lsmod] = "${base_bindir}/lsmod.${BPN}"
64 63
65ALTERNATIVE_LINK_NAME[depmod] = "${base_sbindir}/depmod" 64ALTERNATIVE_LINK_NAME[depmod] = "${base_sbindir}/depmod"
66 65
67PACKAGES =+ "libkmod" 66PACKAGES =+ "libkmod ${PN}-bash-completion"
68 67
69FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}" 68FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}"
70FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d" 69FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d"
70FILES_${PN}-bash-completion = "${datadir}/bash-completion"