Patchwork kmod: fix zlib dependency

login
register
mail settings
Submitter Martin Jansa
Date Dec. 30, 2013, 2:50 p.m.
Message ID <1388415018-6181-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/63901/
State Accepted
Commit 7774bdf778921e50872c9e3fa6a24d450b057a32
Headers show

Comments

Martin Jansa - Dec. 30, 2013, 2:50 p.m.
* 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@gmail.com>
---
 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(-)

Patch

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 f8d5bac..ac9de2f 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -8,7 +8,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"