[oe-commits] org.oe.dev merge of '214ed7e892086095fb4e656e5d3777e201866e46'

[john_lee commit]

merge of '214ed7e892086095fb4e656e5d3777e201866e46'
     and '824c66fc36263bf7387bf3cac74b83506fa27024'

Author: john_lee at openmoko.com
Branch: org.openembedded.dev
Revision: ea47db0fd7281e15db0ba80201db5fc61a11455f
ViewMTN: http://monotone.openembedded.org/revision/info/ea47db0fd7281e15db0ba80201db5fc61a11455f
Files:
1
packages/meta/external-toolchain.bb
packages/tasks/task-openmoko-toolchain-host.bb
packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb
packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb
classes/kernel.bbclass
Diffs:

#
# mt diff -r214ed7e892086095fb4e656e5d3777e201866e46 -rea47db0fd7281e15db0ba80201db5fc61a11455f
#
# 
# 
# patch "packages/meta/external-toolchain.bb"
#  from [dcaf40be62789b278a8bcf32b7d1a80010487c6a]
#    to [8a4aa638876b87a86af07f785abb89bf79bf0378]
# 
# patch "packages/tasks/task-openmoko-toolchain-host.bb"
#  from [b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c]
#    to [18d598d5b825df34b71ca3782f11a025f482fd94]
# 
============================================================
--- packages/meta/external-toolchain.bb	dcaf40be62789b278a8bcf32b7d1a80010487c6a
+++ packages/meta/external-toolchain.bb	8a4aa638876b87a86af07f785abb89bf79bf0378
@@ -15,7 +15,7 @@ PROVIDES = "\
     virtual/linux-libc-headers \
     "
 
-RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+#RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
 PACKAGES_DYNAMIC = "glibc-gconv-*"
 PR = "r1"
 
============================================================
--- packages/tasks/task-openmoko-toolchain-host.bb	b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c
+++ packages/tasks/task-openmoko-toolchain-host.bb	18d598d5b825df34b71ca3782f11a025f482fd94
@@ -11,16 +11,3 @@ RDEPENDS_${PN} += "\
 RDEPENDS_${PN} += "\
     openmoko-sample2-src \
 "
-require task-sdk-host.bb
-
-DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
-LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-
-PR = "r0"
-
-PACKAGES = "${PN}"
-
-RDEPENDS_${PN} += "\
-    openmoko-sample2-src \
-"


#
# mt diff -r824c66fc36263bf7387bf3cac74b83506fa27024 -rea47db0fd7281e15db0ba80201db5fc61a11455f
#
# 
# 
# delete "packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb"
# 
# delete "packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb"
# 
# patch "classes/kernel.bbclass"
#  from [0a8f1fb021e05b2bb2d0d90220ce554ae65408c2]
#    to [5e2fcea2343f6d39c34c218026c453952cb0c444]
# 
============================================================
--- classes/kernel.bbclass	0a8f1fb021e05b2bb2d0d90220ce554ae65408c2
+++ classes/kernel.bbclass	5e2fcea2343f6d39c34c218026c453952cb0c444
@@ -231,6 +231,8 @@ module_autoload_sa1100-rtc = "sa1100-rtc
 module_autoload_ircomm-tty = "ircomm-tty"
 module_autoload_rfcomm = "rfcomm"
 module_autoload_sa1100-rtc = "sa1100-rtc"
+# sa1100-rtc was renamed in 2.6.23 onwards
+module_autoload_rtc-sa1100 = "rtc-sa1100"
 
 # alias defaults (alphabetically sorted)
 module_conf_af_packet = "alias net-pf-17 af_packet"