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:46:14 +0100 |
| commit | e76181535fce8bd4bb63f55106de4d074cae4e06 (patch) | |
| tree | 7bcfeac0ace84adf5579a230f1068eb537c6ad2e | |
| parent | 68322eadd1d9456e606b375c2f4181725784c292 (diff) | |
| download | openembedded-core-e76181535fce8bd4bb63f55106de4d074cae4e06.tar.gz openembedded-core-e76181535fce8bd4bb63f55106de4d074cae4e06.tar.bz2 openembedded-core-e76181535fce8bd4bb63f55106de4d074cae4e06.zip | |
kmod: Update to Rev 15 via git
Also nail down a previously floating dependancy on zlib, which is required for ptest
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-kernel/kmod/kmod-native_git.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-kernel/kmod/kmod.inc | 12 | ||||
| -rw-r--r-- | meta/recipes-kernel/kmod/kmod_git.bb | 6 |
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 @@ require kmod.inc inherit native -SRC_URI += "file://fix-undefined-O_CLOEXEC.patch \ - file://0001-Fix-build-with-older-gcc-4.6.patch \ +SRC_URI += "file://0001-Fix-build-with-older-gcc-4.6.patch \ file://Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch \ " 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+" LICENSE_libkmod = "LGPL-2.1+" SECTION = "base" -DEPENDS += "pkgconfig-native" +DEPENDS += "pkgconfig-native zlib" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " inherit autotools gtk-doc ptest +SRCREV = "18811d22e9923893555b88a482aa967db0e7892a" +# Lookout for PV bump too when SRCREV is changed +PV = "15+git${SRCPV}" + SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ file://depmod-search.conf \ file://run-ptest \ @@ -23,14 +27,10 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ file://fix-seperatebuilddir.patch \ " -SRCREV = "3b38c7fcb58be4ddc34f90454c5f5dc3693d2d85" -# Lookout for PV bump too when SRCREV is changed -PV = "14" - S = "${WORKDIR}/git" EXTRA_AUTORECONF += "--install --symlink" -EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools --disable-manpages" +EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools --disable-manpages --with-zlib" do_configure_prepend () { 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 @@ require kmod.inc -PV_append = "+git${SRCPV}" - 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" RCONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" @@ -34,6 +32,7 @@ do_install_append () { # install depmod.d file for search/ dir install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf" + } do_compile_prepend() { @@ -64,7 +63,8 @@ ALTERNATIVE_TARGET[lsmod] = "${base_bindir}/lsmod.${BPN}" ALTERNATIVE_LINK_NAME[depmod] = "${base_sbindir}/depmod" -PACKAGES =+ "libkmod" +PACKAGES =+ "libkmod ${PN}-bash-completion" FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}" FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d" +FILES_${PN}-bash-completion = "${datadir}/bash-completion" |