[oe-commits] org.oe.dev merge of 'd0db4fe5ad1d91160b33f81ec5ebbbf8fec44705'

[hrw commit]

merge of 'd0db4fe5ad1d91160b33f81ec5ebbbf8fec44705'
     and 'f1ebcfc050fa0c66cfe910e2aa31d1e069b99949'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 0b6354a57db70b62eccbe5522490947545014f85
ViewMTN: http://monotone.openembedded.org/revision/info/0b6354a57db70b62eccbe5522490947545014f85
Files:
1
classes/module.bbclass
packages/hostap/hostap-conf_1.0.bb
packages/orinoco/orinoco-conf_1.0.bb
packages/linux/linux-ezx_2.6.23.bb
Diffs:

#
# mt diff -rd0db4fe5ad1d91160b33f81ec5ebbbf8fec44705 -r0b6354a57db70b62eccbe5522490947545014f85
#
# 
# 
# patch "classes/module.bbclass"
#  from [b4a2435539a6183bfff6b02bc73785bbceeadef6]
#    to [04ebb27c817750a39f3c15612ebc60e9fad68bc8]
# 
# patch "packages/hostap/hostap-conf_1.0.bb"
#  from [1867bc11b1fe449c1247c06ce2003b49eff01c6a]
#    to [6e6b5d5713579f084a9bcb38dd6ba833af13b8dd]
# 
# patch "packages/orinoco/orinoco-conf_1.0.bb"
#  from [f349f21b724b3613e76dd365283e2693ca2bdd3b]
#    to [0a8e6f6e947d589c1a97624037da47b71b12a41c]
# 
============================================================
--- classes/module.bbclass	b4a2435539a6183bfff6b02bc73785bbceeadef6
+++ classes/module.bbclass	04ebb27c817750a39f3c15612ebc60e9fad68bc8
@@ -1,4 +1,4 @@
-RDEPENDS += "kernel (${KERNEL_VERSION})"
+RDEPENDS += "kernel (${KERNEL_VERSION}) update-modules"
 DEPENDS += "virtual/kernel"
 
 inherit module-base
============================================================
--- packages/hostap/hostap-conf_1.0.bb	1867bc11b1fe449c1247c06ce2003b49eff01c6a
+++ packages/hostap/hostap-conf_1.0.bb	6e6b5d5713579f084a9bcb38dd6ba833af13b8dd
@@ -1,9 +1,10 @@ LICENSE = "GPL"
 DESCRIPTION = "PCMCIA-cs configuration files for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
 LICENSE = "GPL"
+RDEPENDS = "update-modules"
 PACKAGE_ARCH = "all"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "file://hostap_cs.conf \
            file://hostap_cs.modalias \
============================================================
--- packages/orinoco/orinoco-conf_1.0.bb	f349f21b724b3613e76dd365283e2693ca2bdd3b
+++ packages/orinoco/orinoco-conf_1.0.bb	0a8e6f6e947d589c1a97624037da47b71b12a41c
@@ -1,9 +1,10 @@ LICENSE = "GPL"
 DESCRIPTION = "PCMCIA-cs configuration files for Hermes (Orinoco) wireless LAN cards"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
 LICENSE = "GPL"
+RDEPENDS = "update-modules"
 PACKAGE_ARCH = "all"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "file://spectrum.conf \
            file://hermes.conf \


#
# mt diff -rf1ebcfc050fa0c66cfe910e2aa31d1e069b99949 -r0b6354a57db70b62eccbe5522490947545014f85
#
# 
# 
# patch "packages/linux/linux-ezx_2.6.23.bb"
#  from [6956faf2658aaff724938f9342bac39c5b3e800b]
#    to [9643edd319aadd9ca25e618022a91b5d11ce9298]
# 
============================================================
--- packages/linux/linux-ezx_2.6.23.bb	6956faf2658aaff724938f9342bac39c5b3e800b
+++ packages/linux/linux-ezx_2.6.23.bb	9643edd319aadd9ca25e618022a91b5d11ce9298
@@ -6,7 +6,9 @@ DEFAULT_PREFERENCE = "-99"
 
 # unstable branch, use 2.6.21 if you want something working
 DEFAULT_PREFERENCE = "-99"
+DEFAULT_PREFERENCE_a780 = "99"
 
+
 # last sync: svn revision 2068
 
 require linux.inc