[oe-commits] org.oe.dev merge of '64b4d4f122fe8531d9c08f7e98f633c6a0a1b171'

[oe commit]

merge of '64b4d4f122fe8531d9c08f7e98f633c6a0a1b171'
     and 'd839f215519a9a54cb807f39abfc917295da81f2'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 5c5f2cd9f16b699d36f666b47316d341ea79802a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5c5f2cd9f16b699d36f666b47316d341ea79802a
Files:
1
packages/linux/linux_2.6.22+2.6.23-rc3.bb
packages/linux/linux_2.6.21.bb
packages/openmoko2/openmoko-dialer2_svn.bb
Diffs:

#
# mt diff -r64b4d4f122fe8531d9c08f7e98f633c6a0a1b171 -r5c5f2cd9f16b699d36f666b47316d341ea79802a
#
# 
# 
# add_file "packages/linux/linux_2.6.22+2.6.23-rc3.bb"
#  content [077937f15108c34d551011de6665dfaddab3a820]
# 
# patch "packages/linux/linux_2.6.21.bb"
#  from [334365c6be19ebecd953842a2dbbabc7b9c4dc98]
#    to [51078603e68d6aece27414a9061c93e670e9a7f2]
# 
============================================================
--- packages/linux/linux_2.6.22+2.6.23-rc3.bb	077937f15108c34d551011de6665dfaddab3a820
+++ packages/linux/linux_2.6.22+2.6.23-rc3.bb	077937f15108c34d551011de6665dfaddab3a820
@@ -0,0 +1,23 @@
+require linux.inc
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_at91sam9263ek = "1"
+
+BASE_KERNEL_VERSION = "2.6.22"
+KERNEL_VERSION = "2.6.23-rc3"
+KERNEL_RELEASE = "2.6.23-rc3"
+
+PR = "r0"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${BASE_KERNEL_VERSION}.tar.bz2 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2;patch=1 \
+           file://defconfig \
+	   "
+
+SRC_URI_append_kb9202 = " http://maxim.org.za/AT91RM9200/2.6/2.6.23-rc3-at91.patch.gz;patch=1 \
+                        "
+SRC_URI_append_at91sam9263ek = " http://maxim.org.za/AT91RM9200/2.6/2.6.23-rc3-at91.patch.gz;patch=1 \
+                               "
+S = "${WORKDIR}/linux-${BASE_KERNEL_VERSION}"
+
+
============================================================
--- packages/linux/linux_2.6.21.bb	334365c6be19ebecd953842a2dbbabc7b9c4dc98
+++ packages/linux/linux_2.6.21.bb	51078603e68d6aece27414a9061c93e670e9a7f2
@@ -1,9 +1,10 @@ DEFAULT_PREFERENCE_at91sam9263ek = "-1"
 require linux.inc
 
 DEFAULT_PREFERENCE_at91sam9263ek = "-1"
-DEFAULT_PREFERENCE_gumstix = "1"
+DEFAULT_PREFERENCE_gumstix-connex = "1"
+DEFAULT_PREFERENCE_gumstix-verdex = "1"
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://defconfig \


#
# mt diff -rd839f215519a9a54cb807f39abfc917295da81f2 -r5c5f2cd9f16b699d36f666b47316d341ea79802a
#
# 
# 
# patch "packages/openmoko2/openmoko-dialer2_svn.bb"
#  from [216d1c709e8aba9b01a699aa8ca12fd0920b4f2f]
#    to [84fe6bcd1b497984a1f6ee8ecf67a73ecca545ad]
# 
============================================================
--- packages/openmoko2/openmoko-dialer2_svn.bb	216d1c709e8aba9b01a699aa8ca12fd0920b4f2f
+++ packages/openmoko2/openmoko-dialer2_svn.bb	84fe6bcd1b497984a1f6ee8ecf67a73ecca545ad
@@ -1,9 +1,8 @@ SECTION = "openmoko/pim"
 DESCRIPTION = "The OpenMoko Dialer"
 SECTION = "openmoko/pim"
-DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 gstreamer"
-RDEPENDS = "gst-meta-audio"
+DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r2"
+PR = "r3"
 
 inherit openmoko2