Skip to contentSkip to conversation

multilib: Fix kernel-module dependency

GIT PULL New Dongxiao Xu 2 participants 4 messages Sep 7, 2011

lore
Share & tools
lore
#0 lore raw

Hi Richard,

This pull request is to fix the dependency/recommends of kernel-module-* in other recipes. Besides, there is another patch to remove the linux-yocto extension in multilib.conf. Please help to review and pull.

Thanks,
Dongxiao

The following changes since commit 41b7c955cfdc7b4d5c667c8a8742237d5edaca4f:

icu-3.6: fix building with big make -j (2011-09-05 20:38:50 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/ml
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/ml

Dongxiao Xu (2):
multilib_global.bbclass: handle kernel-module-* for multilib
multilib: Remove the multilib extension for linux-yocto

 meta/classes/multilib_global.bbclass |    2 ++
 meta/conf/multilib.conf              |    1 -
 2 files changed, 2 insertions(+), 1 deletions(-)
#1 lore raw

PATCH 1/2 multilib_global.bbclass: handle kernel-module-* for multilib

bitbake would report failed dependency of kernel-module-* when testing multilib. kernel-module-* are recommended by some other recipes.

Do not extend name for kernel-module-* related packages.

[YOCTO #1456]

---
 meta/classes/multilib_global.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
meta/classes/multilib_global.bbclass +2 -0
index 217349b..1263e4e 100644
@@ -17,6 +17,8 @@ python multilib_virtclass_handler_global () {
 addhandler multilib_virtclass_handler_global
 
 def multilib_extend_name(variant, name):
+    if name.startswith("kernel-module"):
+        return name
     if name.startswith("virtual/"):
         subs = name.split("/", 1)[1]
         if not subs.startswith(variant):
Signature · 1 line
1.7.1
#2 lore raw

PATCH 2/2 multilib: Remove the multilib extension for linux-yocto

In reply to Dongxiao Xu

Kernel should be unique in a multilib system, so we remove the linux-yocto's extension in multilib.conf

---
 meta/conf/multilib.conf |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
meta/conf/multilib.conf +0 -1
index eec1da7..f23fbb7 100644
@@ -242,7 +242,6 @@ BBCLASSEXTEND_append_pn-libxxf86vm = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-libzypp = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-lighttpd = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-linux-libc-headers = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-linux-yocto = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-logrotate = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-lrzsz = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-lsb = " ${MULTILIBS}"
Signature · 1 line
1.7.1
#3 lore raw
In reply to Dongxiao Xu
Quoted 14 lines · Dongxiao Xu

Hi Richard,

This pull request is to fix the dependency/recommends of kernel-module-* in other recipes. Besides, there is another patch to remove the linux-yocto extension in multilib.conf. Please help to review and pull.

Thanks,
Dongxiao

The following changes since commit 41b7c955cfdc7b4d5c667c8a8742237d5edaca4f:

icu-3.6: fix building with big make -j (2011-09-05 20:38:50 +0100)

Quoted 7 lines

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/ml
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/ml

Dongxiao Xu (2):
multilib_global.bbclass: handle kernel-module-* for multilib
multilib: Remove the multilib extension for linux-yocto

Merged to master, thanks.

Richard