diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2013-12-30 15:50:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-02 12:56:28 +0000 |
commit | 7774bdf778921e50872c9e3fa6a24d450b057a32 (patch) | |
tree | ec3618ab47fffd38188fbcfe9156d39964719ff3 /meta/recipes-kernel/kmod | |
parent | 6710c395f40208e6fddab7056423e70afcd3da3a (diff) | |
download | openembedded-core-contrib-7774bdf778921e50872c9e3fa6a24d450b057a32.tar.gz |
kmod: fix zlib dependency
* unlike BBCLASSEXTENDed native support, dependencies in kmod-native doesn't get
automatic -native suffix, so kmod-native was depending on target zlib.
* move the dependency from .inc and apply it with right suffix
(From OE-Core rev: ef0a1812cd79a68f30da5b2770cd5c566d6ecf0b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.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.bb | 3 | ||||
-rw-r--r-- | meta/recipes-kernel/kmod/kmod.inc | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/kmod/kmod_git.bb | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb index fccc39bb37..6600413476 100644 --- a/meta/recipes-kernel/kmod/kmod-native_git.bb +++ b/meta/recipes-kernel/kmod/kmod-native_git.bb @@ -2,6 +2,9 @@ # Released under the MIT license (see COPYING.MIT for the terms) require kmod.inc + +DEPENDS += "zlib-native" + inherit native SRC_URI += "file://0001-Fix-build-with-older-gcc-4.6.patch \ diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc index 3eef69aed8..94724e45b8 100644 --- a/meta/recipes-kernel/kmod/kmod.inc +++ b/meta/recipes-kernel/kmod/kmod.inc @@ -9,7 +9,7 @@ LICENSE = "GPL-2.0+ & LGPL-2.1+" LICENSE_libkmod = "LGPL-2.1+" SECTION = "base" -DEPENDS += "pkgconfig-native zlib" +DEPENDS += "pkgconfig-native" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb index f90b9aaec9..c55cbd3e1e 100644 --- a/meta/recipes-kernel/kmod/kmod_git.bb +++ b/meta/recipes-kernel/kmod/kmod_git.bb @@ -3,6 +3,7 @@ require kmod.inc +DEPENDS += "zlib" 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" |