[oe-commits] Martin Jansa : kmod: fix zlib dependency
git at git.openembedded.org
git at git.openembedded.org
Thu Jan 2 12:53:33 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: ef0a1812cd79a68f30da5b2770cd5c566d6ecf0b
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ef0a1812cd79a68f30da5b2770cd5c566d6ecf0b
Author: Martin Jansa <martin.jansa at gmail.com>
Date: Mon Dec 30 15:50:18 2013 +0100
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
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-kernel/kmod/kmod-native_git.bb | 3 +++
meta/recipes-kernel/kmod/kmod.inc | 2 +-
meta/recipes-kernel/kmod/kmod_git.bb | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb
index fccc39b..6600413 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 3eef69a..94724e4 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 f90b9aa..c55cbd3 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"
More information about the Openembedded-commits
mailing list