summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-12-30 15:50:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-02 12:56:28 +0000
commit7774bdf778921e50872c9e3fa6a24d450b057a32 (patch)
treeec3618ab47fffd38188fbcfe9156d39964719ff3
parent6710c395f40208e6fddab7056423e70afcd3da3a (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-kernel/kmod/kmod-native_git.bb3
-rw-r--r--meta/recipes-kernel/kmod/kmod.inc2
-rw-r--r--meta/recipes-kernel/kmod/kmod_git.bb1
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 @@
2# Released under the MIT license (see COPYING.MIT for the terms) 2# Released under the MIT license (see COPYING.MIT for the terms)
3 3
4require kmod.inc 4require kmod.inc
5
6DEPENDS += "zlib-native"
7
5inherit native 8inherit native
6 9
7SRC_URI += "file://0001-Fix-build-with-older-gcc-4.6.patch \ 10SRC_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+"
9LICENSE_libkmod = "LGPL-2.1+" 9LICENSE_libkmod = "LGPL-2.1+"
10SECTION = "base" 10SECTION = "base"
11 11
12DEPENDS += "pkgconfig-native zlib" 12DEPENDS += "pkgconfig-native"
13 13
14LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 14LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
15 file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 15 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 @@
3 3
4require kmod.inc 4require kmod.inc
5 5
6DEPENDS += "zlib"
6PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 7PROVIDES += "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" 8RPROVIDES_${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" 9RCONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"