[oe-commits] Phil Blundell : kernel.bbclass: don' t add dependency on update-modules if not doing O_P_M

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: cbef7988989e4a0ca7822c78a58b5da6bbc6eb6b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=cbef7988989e4a0ca7822c78a58b5da6bbc6eb6b

Author: Phil Blundell <philb at gnu.org>
Date:   Wed Jun 17 14:32:56 2009 +0100

kernel.bbclass: don't add dependency on update-modules if not doing O_P_M

---

 classes/kernel.bbclass |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 1323228..ae7e643 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -441,10 +441,14 @@ python populate_packages_prepend () {
 
 	postinst = bb.data.getVar('pkg_postinst_modules', d, 1)
 	postrm = bb.data.getVar('pkg_postrm_modules', d, 1)
+
+        maybe_update_modules = "update-modules "
+        if bb.data.getVar("ONLINE_PACKAGE_MANAGEMENT", d) == "none":
+                maybe_update_modules = ""
 	
 	do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.bin$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
 	do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
-	do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-%s' % bb.data.getVar("KERNEL_VERSION", d, 1))
+	do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='%skernel-%s' % (maybe_update_modules, bb.data.getVar("KERNEL_VERSION", d, 1)))
 
 	import re, os
 	metapkg = "kernel-modules"