[oe-commits] org.oe.dev merge of '159bde97bf43587e841741dc7ae1798e02ad78f6'

[hrw commit]

merge of '159bde97bf43587e841741dc7ae1798e02ad78f6'
     and 'b37835d2c741793df9f326066d6f5563e070f405'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: a8b35e3a949cb735cf918069d98cc153b5099b2c
ViewMTN: http://monotone.openembedded.org/revision/info/a8b35e3a949cb735cf918069d98cc153b5099b2c
Files:
1
packages/linux/linux_2.6.21.bb
conf/distro/openmoko.conf
packages/starling/starling_0.2.bb
Diffs:

#
# mt diff -r159bde97bf43587e841741dc7ae1798e02ad78f6 -ra8b35e3a949cb735cf918069d98cc153b5099b2c
#
# 
# 
# patch "packages/linux/linux_2.6.21.bb"
#  from [476d26ea7c5cbc48a8347d9c8d5297561b2ce2df]
#    to [27643b882eb2ef188e62836637b435c23a0cb9b6]
# 
============================================================
--- packages/linux/linux_2.6.21.bb	476d26ea7c5cbc48a8347d9c8d5297561b2ce2df
+++ packages/linux/linux_2.6.21.bb	27643b882eb2ef188e62836637b435c23a0cb9b6
@@ -1,10 +1,10 @@ DEFAULT_PREFERENCE_gumstix-verdex = "1"
 require linux.inc
 
 DEFAULT_PREFERENCE_at91sam9263ek = "-1"
 DEFAULT_PREFERENCE_gumstix-connex = "1"
 DEFAULT_PREFERENCE_gumstix-verdex = "1"
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://defconfig \
@@ -63,7 +63,6 @@ GUMSTIX_PATCHES = "\
        file://mmc-card-detect.patch;patch=1 \
        file://misalignment-handling.patch;patch=1 \
        file://compile-fix-pxa_cpufreq.patch;patch=1 \
-       file://ramfs-mode-support.patch;patch=1 \
        file://pxafb-definition.patch;patch=1 \
        file://270-usb-gadget-udc.patch;patch=1 \
        file://gumstix-pxa270-usb-host.patch;patch=1 \


#
# mt diff -rb37835d2c741793df9f326066d6f5563e070f405 -ra8b35e3a949cb735cf918069d98cc153b5099b2c
#
# 
# 
# patch "conf/distro/openmoko.conf"
#  from [f11e22bc56a237fa548e77d0512477cb02da9a98]
#    to [c246d427631dbd56b159221956899cc2f40f3b06]
# 
# patch "packages/starling/starling_0.2.bb"
#  from [9d0522f1342ae339228f0a79a466835a9483cb9c]
#    to [a03b1e9d48277355287cfd137c098256c14819b1]
# 
============================================================
--- conf/distro/openmoko.conf	f11e22bc56a237fa548e77d0512477cb02da9a98
+++ conf/distro/openmoko.conf	c246d427631dbd56b159221956899cc2f40f3b06
@@ -35,4 +35,5 @@ require conf/distro/include/preferred-op
 PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
 
 require conf/distro/include/preferred-openmoko-versions.inc
+require conf/distro/include/moko-autorev.inc
 
============================================================
--- packages/starling/starling_0.2.bb	9d0522f1342ae339228f0a79a466835a9483cb9c
+++ packages/starling/starling_0.2.bb	a03b1e9d48277355287cfd137c098256c14819b1
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "Starling audio player for GPE"
 SECTION = "gpe/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup"
+DEPENDS = "gtk+ gstreamer gst-plugins-good gst-plugins-bad sqlite libsoup gnutls"
 
 RDEPENDS = "esd \
         gst-plugin-audioconvert \