[oe-commits] org.oe.dev merge of '5218b291289ff56a8d3f0caa1ddf13f84dfe516f'

[koen commit]

merge of '5218b291289ff56a8d3f0caa1ddf13f84dfe516f'
     and '8e25ce126ed9c9216d456d96f115eadd784f8157'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 27d966cfcd91da6a19cd4c5de92a0a8bfcc15dce
ViewMTN: http://monotone.openembedded.org/revision/info/27d966cfcd91da6a19cd4c5de92a0a8bfcc15dce
Files:
1
packages/gsm/gsmd.inc
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r5218b291289ff56a8d3f0caa1ddf13f84dfe516f -r27d966cfcd91da6a19cd4c5de92a0a8bfcc15dce
#
# 
# 
# patch "packages/gsm/gsmd.inc"
#  from [6d44b4f22e49df65f27d1ed8e757157c72fb4888]
#    to [47a99ec93ca96658be70db56cfe0b8ef57b36875]
# 
============================================================
--- packages/gsm/gsmd.inc	6d44b4f22e49df65f27d1ed8e757157c72fb4888
+++ packages/gsm/gsmd.inc	47a99ec93ca96658be70db56cfe0b8ef57b36875
@@ -5,7 +5,7 @@ PV = "0.1+svnr${SRCREV}"
 PROVIDES += "gsmd"
 RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
 PV = "0.1+svnr${SRCREV}"
-PR = "r38"
+PR = "r39"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
@@ -43,6 +43,8 @@ PACKAGES =+ "\
   ${BASEPN}-plugin-vendor-tihtc \
 "
 
+ALLOW_EMPTY_${BASEPN}-plugin-machine-gta01 = "1"
+
 RDEPENDS_${BASEPN}-plugins = "\
   ${BASEPN}-plugin-machine-generic \
   ${BASEPN}-plugin-machine-tihtc \


#
# mt diff -r8e25ce126ed9c9216d456d96f115eadd784f8157 -r27d966cfcd91da6a19cd4c5de92a0a8bfcc15dce
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [5b667fd5f1683e4c70d3e952694733bb718cd6d8]
#    to [16007506d388e989d66874f26d8a73737a4a7ef4]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [cdd382dd48e69a1cb0f7a98b39f63aa1a7130540]
#    to [5064b92d581b19db3f8834669b3079f971c98b2f]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [6d0c484efba81861d983282087a7cb547e23b01a]
#    to [a7241387cffe65ec6d95b9d1ba03094818c4c4fd]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	5b667fd5f1683e4c70d3e952694733bb718cd6d8
+++ conf/distro/angstrom-2007.1.conf	16007506d388e989d66874f26d8a73737a4a7ef4
@@ -71,10 +71,6 @@ PREFERRED_PROVIDER_xserver          ?= "
 PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
 
-PREFERRED_VERSION_libxrandr         ?= "1.2.1"
-PREFERRED_VERSION_xrandr            ?= "1.2.0" 
-PREFERRED_VERSION_randrproto        ?= "1.2.1"
-
 #use EABI ready toolchain
 PREFERRED_VERSION_gcc               ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross         ?= "4.1.2"
============================================================
--- conf/distro/angstrom-2008.1.conf	cdd382dd48e69a1cb0f7a98b39f63aa1a7130540
+++ conf/distro/angstrom-2008.1.conf	5064b92d581b19db3f8834669b3079f971c98b2f
@@ -57,12 +57,8 @@ PCMCIA_MANAGER = "pcmciautils"
 PCMCIA_MANAGER = "pcmciautils"
 
 #Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh17"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh18"
 
-PREFERRED_VERSION_gcc                   = "4.2.1"
-PREFERRED_VERSION_gcc-cross             = "4.2.1"
-PREFERRED_VERSION_gcc-cross-initial    	= "4.1.2"
-
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
 
@@ -91,6 +87,11 @@ PREFERRED_PROVIDER_xserver          ?= "
 PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
 
+PREFERRED_VERSION_gcc               ?= "4.2.2"
+PREFERRED_VERSION_gcc-cross         ?= "4.2.2"
+PREFERRED_VERSION_gcc-cross-sdk     ?= "4.2.2"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2"
+
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc
@@ -177,8 +178,6 @@ DISTRO_EXTRA_RDEPENDS += "\
     angstrom-version \
     ipkg ipkg-collateral \
     util-linux-mount util-linux-umount \
-    avahi-daemon \
-    avahi-autoipd \
     ${DEBUG_APPS} \
     "
 
@@ -186,4 +185,7 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     kernel-module-vfat \
     kernel-module-ext2 \
     kernel-module-af-packet \
+    avahi-daemon \
+    avahi-autoipd \
+    openssh-sftp-server \
     "
============================================================
--- conf/distro/include/sane-srcrevs.inc	6d0c484efba81861d983282087a7cb547e23b01a
+++ conf/distro/include/sane-srcrevs.inc	a7241387cffe65ec6d95b9d1ba03094818c4c4fd
@@ -29,7 +29,7 @@ SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libfakekey ?= "1455"
-SRCREV_pn-libgsmd ?= "3074"
+SRCREV_pn-libgsmd ?= "3434"
 SRCREV_pn-libgsmd-devel ?= "3293"
 SRCREV_pn-libjana ?= "665"
 SRCREV_pn-libmokogsmd2 ?= "3362"