[oe-commits] org.oe.dev merge of '027df8bfceecb5d21ab2b2b76d0d191124b3446b'

koen commit oe at amethyst.openembedded.net
Wed Jul 16 09:31:03 UTC 2008 

merge of '027df8bfceecb5d21ab2b2b76d0d191124b3446b'
     and 'daafad010cbf738246a5e77122c2e1e4f951c9f5'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: b5b2a17fb6616a08cfa4b647c410de4e591fe97d
ViewMTN: http://monotone.openembedded.org/revision/info/b5b2a17fb6616a08cfa4b647c410de4e591fe97d
Files:
1
packages/freesmartphone/python-odeviced
packages/freesmartphone/python-odeviced/odeviced
packages/freesmartphone/python-odeviced/odeviced.conf
packages/freesmartphone/python-odeviced/om-gta02
packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf
packages/freesmartphone/python-odeviced_git.bb
packages/freesmartphone/python-oeventd
packages/freesmartphone/python-oeventd/oeventd
packages/freesmartphone/python-oeventd_git.bb
packages/freesmartphone/python-ophoned
packages/freesmartphone/python-ophoned/ophoned
packages/freesmartphone/python-ophoned_git.bb
packages/freesmartphone/python-ousaged
packages/freesmartphone/python-ousaged/ousaged
packages/freesmartphone/python-ousaged_git.bb
packages/openmoko-apps
packages/openmoko-apps/files
packages/openmoko-apps/files/unbreak-messages.patch
packages/openmoko-apps/openmoko-appmanager_svn.bb
packages/openmoko-apps/openmoko-calculator_svn.bb
packages/openmoko-apps/openmoko-dialer_svn.bb
packages/openmoko-apps/openmoko-footer_svn.bb
packages/openmoko-apps/openmoko-messages_svn.bb
packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
packages/openmoko-apps/openmoko-taskmanager_svn.bb
packages/openmoko-apps/openmoko-terminal
packages/openmoko-apps/openmoko-terminal/gtkterm2rc
packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop
packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png
packages/openmoko-apps/openmoko-terminal_svn.bb
packages/openmoko-inputmethods
packages/openmoko-inputmethods/openmoko-keyboard_svn.bb
packages/openmoko-pim
packages/openmoko-pim/files
packages/openmoko-pim/files/index.theme
packages/openmoko-pim/files/intltool-update.in
packages/openmoko-pim/files/openmoko-dates.desktop
packages/openmoko-pim/files/openmoko-dates.png
packages/openmoko-pim/files/stock_contact.png
packages/openmoko-pim/files/stock_person.png
packages/openmoko-pim/openmoko-contacts_svn.bb
packages/openmoko-pim/openmoko-dates_svn.bb
packages/openmoko-pim/openmoko-tasks_svn.bb
packages/openmoko-pim/openmoko-today_svn.bb
packages/openmoko-tools
packages/openmoko-tools/openmoko-chordmaster_svn.bb
packages/openmoko-apps/omext_0.2.bb
packages/openmoko-3rdparty/omext_0.2.bb
packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb
packages/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb
packages/openmoko-tools/pty-forward-native.bb
packages/serial-utils/pty-forward-native.bb
packages/openmoko-tools/serial-forward.bb
packages/serial-utils/serial-forward.bb
packages/openmoko2/settingsgui_0.7+0.8-beta.bb
packages/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb
packages/openmoko-3rdparty
packages/serial-utils
conf/distro/include/moko-autorev.inc
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcdates.inc
packages/dsplink/dsplink.inc
packages/dsplink/dsplink_1.50.bb
packages/dsplink/dsplink_1.51.00.08.bb
packages/dsplink/files/CURRENTCFG.MK
packages/dsplink/files/c64xx_5.xx_linux.mk
packages/python/python-2.5.2/default-is-optimized.patch
packages/python/python-evas_cvs.bb
packages/python/python_2.5.2.bb
packages/rsync/rsync.inc
packages/rsync/rsync_2.6.9.bb
packages/rsync/rsync_3.0.0.bb
packages/linux/linux-omap2_git.bb
Diffs:

#
# mt diff -r027df8bfceecb5d21ab2b2b76d0d191124b3446b -rb5b2a17fb6616a08cfa4b647c410de4e591fe97d
#
#
#
# delete "packages/freesmartphone/python-odeviced"
# 
# delete "packages/freesmartphone/python-odeviced/odeviced"
# 
# delete "packages/freesmartphone/python-odeviced/odeviced.conf"
# 
# delete "packages/freesmartphone/python-odeviced/om-gta02"
# 
# delete "packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf"
# 
# delete "packages/freesmartphone/python-odeviced_git.bb"
# 
# delete "packages/freesmartphone/python-oeventd"
# 
# delete "packages/freesmartphone/python-oeventd/oeventd"
# 
# delete "packages/freesmartphone/python-oeventd_git.bb"
# 
# delete "packages/freesmartphone/python-ophoned"
# 
# delete "packages/freesmartphone/python-ophoned/ophoned"
# 
# delete "packages/freesmartphone/python-ophoned_git.bb"
# 
# delete "packages/freesmartphone/python-ousaged"
# 
# delete "packages/freesmartphone/python-ousaged/ousaged"
# 
# delete "packages/freesmartphone/python-ousaged_git.bb"
# 
# delete "packages/openmoko-apps"
# 
# delete "packages/openmoko-apps/files"
# 
# delete "packages/openmoko-apps/files/unbreak-messages.patch"
# 
# delete "packages/openmoko-apps/openmoko-appmanager_svn.bb"
# 
# delete "packages/openmoko-apps/openmoko-calculator_svn.bb"
# 
# delete "packages/openmoko-apps/openmoko-dialer_svn.bb"
# 
# delete "packages/openmoko-apps/openmoko-footer_svn.bb"
# 
# delete "packages/openmoko-apps/openmoko-messages_svn.bb"
# 
# delete "packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb"
# 
# delete "packages/openmoko-apps/openmoko-taskmanager_svn.bb"
# 
# delete "packages/openmoko-apps/openmoko-terminal"
# 
# delete "packages/openmoko-apps/openmoko-terminal/gtkterm2rc"
# 
# delete "packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop"
# 
# delete "packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png"
# 
# delete "packages/openmoko-apps/openmoko-terminal_svn.bb"
# 
# delete "packages/openmoko-inputmethods"
# 
# delete "packages/openmoko-inputmethods/openmoko-keyboard_svn.bb"
# 
# delete "packages/openmoko-pim"
# 
# delete "packages/openmoko-pim/files"
# 
# delete "packages/openmoko-pim/files/index.theme"
# 
# delete "packages/openmoko-pim/files/intltool-update.in"
# 
# delete "packages/openmoko-pim/files/openmoko-dates.desktop"
# 
# delete "packages/openmoko-pim/files/openmoko-dates.png"
# 
# delete "packages/openmoko-pim/files/stock_contact.png"
# 
# delete "packages/openmoko-pim/files/stock_person.png"
# 
# delete "packages/openmoko-pim/openmoko-contacts_svn.bb"
# 
# delete "packages/openmoko-pim/openmoko-dates_svn.bb"
# 
# delete "packages/openmoko-pim/openmoko-tasks_svn.bb"
# 
# delete "packages/openmoko-pim/openmoko-today_svn.bb"
# 
# delete "packages/openmoko-tools"
# 
# delete "packages/openmoko-tools/openmoko-chordmaster_svn.bb"
# 
# rename "packages/openmoko-apps/omext_0.2.bb"
#     to "packages/openmoko-3rdparty/omext_0.2.bb"
# 
# rename "packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb"
#     to "packages/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb"
# 
# rename "packages/openmoko-tools/pty-forward-native.bb"
#     to "packages/serial-utils/pty-forward-native.bb"
# 
# rename "packages/openmoko-tools/serial-forward.bb"
#     to "packages/serial-utils/serial-forward.bb"
# 
# rename "packages/openmoko2/settingsgui_0.7+0.8-beta.bb"
#     to "packages/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb"
# 
# add_dir "packages/openmoko-3rdparty"
# 
# add_dir "packages/serial-utils"
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [89ce7f49f72eea705ed63b4f98b6ffa6d6a02bed]
#    to [eb77aa90895f6cbecf2c200c1810079c8e857afa]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [86c6deec69ab2484f030158e16522ad45e745bd8]
#    to [398b1c782a663466e0069988b2abf9e09f37a1ad]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [6ba2cf7787b2136c08a7c9a4ce71f239b2ad2ffa]
#    to [2fd13fc744e766175938eb267aa49d99d9f5c39e]
# 
# patch "packages/dsplink/dsplink.inc"
#  from [9a18a0df88794b22a58645be2833819c6d551a38]
#    to [9e699e8d88270170f89287867ca77b32b4229d03]
# 
# patch "packages/dsplink/dsplink_1.50.bb"
#  from [de8ff99089087c6bb2111519bc33ea11dcf00b8a]
#    to [7c50fa88c27a143ecaffccf1adaa106fad6cf643]
# 
# patch "packages/dsplink/dsplink_1.51.00.08.bb"
#  from [14446756523260c5cebb79d3bc3e7604947f2525]
#    to [0063cf4a9fd38f4a0da6489370bfd6820b3943ca]
# 
# patch "packages/dsplink/files/CURRENTCFG.MK"
#  from [0bf38a5760260d24afeb780b24aa940164d593d4]
#    to [2d8b0fa316342698cd5493798d1c74ccda6f34fa]
# 
# patch "packages/dsplink/files/c64xx_5.xx_linux.mk"
#  from [b6836bf5cfa973564ebb43ebcbb75b126060bbcd]
#    to [de765f54837afca03e49cb50216c4ff561464280]
# 
# patch "packages/python/python-2.5.2/default-is-optimized.patch"
#  from [524dcf57d51780fdc3c281c49f60fc03193204e0]
#    to [aeb51917d9c931269828e28f524ceb30e897d1c2]
# 
# patch "packages/python/python-evas_cvs.bb"
#  from [004f170367e06ca113e955f686f51ce112ce9368]
#    to [e10e5677f94c661d96f2145c6bf743dc44f4d217]
# 
# patch "packages/python/python_2.5.2.bb"
#  from [5b3625881116fda1abd1f83093917137935991c8]
#    to [2bf6d846cc21654a0850a5e2bd3be1ecf5fb1c7a]
# 
# patch "packages/rsync/rsync.inc"
#  from [1d1f2cbe00f4779bdc3dc7f9689611d817e90259]
#    to [fd74549f3564de106eb8cd72cdfabfbdf421e5c4]
# 
# patch "packages/rsync/rsync_2.6.9.bb"
#  from [1b1f42efd8d5dc944a9638cd0678259c995c08dd]
#    to [b807b09cd2f7fb22a235f423eafea699f2886cdd]
# 
# patch "packages/rsync/rsync_3.0.0.bb"
#  from [dd9114bcedbdbe8b612946916a35fe4a662cd34c]
#    to [c591ba7b4a00c7f5373fa0d50e20725349016102]
#
============================================================
--- conf/distro/include/moko-autorev.inc	89ce7f49f72eea705ed63b4f98b6ffa6d6a02bed
+++ conf/distro/include/moko-autorev.inc	eb77aa90895f6cbecf2c200c1810079c8e857afa
@@ -21,7 +21,6 @@ SRCREV_pn-openmoko-appmanager2 ?= "${AUT
 SRCREV_pn-openmoko-alsa-scenarios ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	86c6deec69ab2484f030158e16522ad45e745bd8
+++ conf/distro/include/preferred-om-2008-versions.inc	398b1c782a663466e0069988b2abf9e09f37a1ad
@@ -1555,8 +1555,8 @@ PREFERRED_VERSION_python-pyreverse ?= "0
 PREFERRED_VERSION_python-pyrad ?= "0.8"
 PREFERRED_VERSION_python-pyraf ?= "1.4"
 PREFERRED_VERSION_python-pyreverse ?= "0.5.2"
-PREFERRED_VERSION_python-pyrex ?= "0.9.5.1a"
-PREFERRED_VERSION_python-pyrex-native ?= "0.9.5.1a"
+PREFERRED_VERSION_python-pyrex ?= "0.9.8"
+PREFERRED_VERSION_python-pyrex-native ?= "0.9.8"
 PREFERRED_VERSION_python-pyro ?= "3.7"
 PREFERRED_VERSION_python-pyserial ?= "2.2"
 PREFERRED_VERSION_python-pytester ?= "0.6.0"
============================================================
--- conf/distro/include/sane-srcdates.inc	6ba2cf7787b2136c08a7c9a4ce71f239b2ad2ffa
+++ conf/distro/include/sane-srcdates.inc	2fd13fc744e766175938eb267aa49d99d9f5c39e
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE ?= "20080610"
+EFL_SRCDATE ?= "20080716"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- packages/dsplink/dsplink.inc	9a18a0df88794b22a58645be2833819c6d551a38
+++ packages/dsplink/dsplink.inc	9e699e8d88270170f89287867ca77b32b4229d03
@@ -11,6 +11,13 @@ export DSPLINK = "${S}"
 # Needed for buildscripts
 export DSPLINK = "${S}"
 
+# Path to the dir where the TI tools are unpacked
+TITOOLSDIR ?= "/OE/TI"
+# Path under TITOOLSDIR where dspbios is unpacked 
+TIBIOSDIR ?= "bios_5_32_03"
+# Path under TITOOLSDIR where the dsp toolchain is unpacked
+TICGTOOLSDIR ?= "cg6x_6_1_2"
+
 DSPLINKPLATFORM ?= "Davinci"
 
 DSPLINKPLATFORM_omap5912osk = "OMAP"
@@ -48,6 +55,8 @@ KERNELARMFLAGS_armv7a = "-c -nostdinc -i
                    -Wdeclaration-after-statement -Os -marm  -mabi=aapcs-linux \
                    -D__KERNEL__ -mno-thumb-interwork   -msoft-float -fno-optimize-sibling-calls -g  -fno-stack-protector -Wno-pointer-sign -g -DUSE_UDEV=1 -DOS_LINUX -DLINUX_KERNEL"
 
+DSPFLAGS = "-q -pdr -pdv -pden -ml3 -mv64+ "
+
 export DSPLINKPLATFORM 
 export DSPLINKDSP
 
@@ -59,7 +68,7 @@ do_configure () {
 	sed -i 	-e s:SED_ME_SOURCEDIR:${S}:g \
 		-e s:SED_ME_GPPDISTRO:openembedded:g \
 		-e s:SED_ME_KERNELVERSION:${KERNEL_VERSION}:g \
-		-e s:SED_ME_DSPDISTRO:openembedded:g \
+		-e s:SED_ME_DSPDISTRO:c64xx_5.xx_linux:g \
 		-e s:SED_ME_PLATFORM:${DSPLINKPLATFORM}:g \
 		-e s:SED_ME_DSP:${DSPLINKDSP}:g \
 		-e s:SED_ME_SOC:${DSPLINKSOC}:g \	
@@ -73,6 +82,11 @@ do_configure () {
 		-e 's:SEDME_USER_ARMFLAGS:${USERARMFLAGS}:g' \
 		${S}/make/Linux/openembedded.mk 
 
+	sed -i -e s:SEDME_TITOOLS_BASEPATH:${TITOOLSDIR}:g \
+		-e s:SEDME_BIOSUNPACKDIR:${TIBIOSDIR}:g \	
+		-e s:SEDME_CGTOOLSDIR:${TICGTOOLSDIR}:g \	
+		-e 's:SEDME_DSPFLAGS:${DSPFLAGS}:g' \
+		${S}/make/DspBios/c64xx_5.xx_linux.mk
 }
 
 PARALLEL_MAKE = ""
@@ -92,6 +106,9 @@ do_compile () {
 	
 	sed -i -e 's:gcc${KERNEL_CCSUFFIX}:gcc:' ${S}/make/Linux/openembedded.mk
 	oe_runmake -C ${S}/gpp/src/samples
+
+	oe_runmake -C ${S}/dsp/src
+	oe_runmake -C ${S}/dsp/src/samples
 }
 
 do_install () {
============================================================
--- packages/dsplink/dsplink_1.50.bb	de8ff99089087c6bb2111519bc33ea11dcf00b8a
+++ packages/dsplink/dsplink_1.50.bb	7c50fa88c27a143ecaffccf1adaa106fad6cf643
@@ -1,6 +1,6 @@ require dsplink.inc
 require dsplink.inc
 
-PR = "r8"
+PR = "r9"
 PE = "1"
 PV = "1.50"
 
============================================================
--- packages/dsplink/dsplink_1.51.00.08.bb	14446756523260c5cebb79d3bc3e7604947f2525
+++ packages/dsplink/dsplink_1.51.00.08.bb	0063cf4a9fd38f4a0da6489370bfd6820b3943ca
@@ -1,6 +1,6 @@ require dsplink.inc
 require dsplink.inc
 
-PR = "r8"
+PR = "r9"
 PE = "1"
 PV = "1.51"
 
============================================================
--- packages/dsplink/files/CURRENTCFG.MK	0bf38a5760260d24afeb780b24aa940164d593d4
+++ packages/dsplink/files/CURRENTCFG.MK	2d8b0fa316342698cd5493798d1c74ccda6f34fa
@@ -48,7 +48,7 @@ export GPPDEVICE           := SED_ME_PLA
 #   Target GPP and DSP devices
 #   =========================================================
 export GPPDEVICE           := SED_ME_PLATFORM
-export DSPDEVICE           := SED_ME_DSP 
+export DSPDEVICE           := SED_ME_DSP
 
 
 #   =========================================================
============================================================
--- packages/dsplink/files/c64xx_5.xx_linux.mk	b6836bf5cfa973564ebb43ebcbb75b126060bbcd
+++ packages/dsplink/files/c64xx_5.xx_linux.mk	de765f54837afca03e49cb50216c4ff561464280
@@ -35,8 +35,8 @@ USE_DISTRIBUTION := 1
 #   ----------------------------------------------------------------------------
 #   Base directory for the DSP OS
 #   ----------------------------------------------------------------------------
-BASE_INSTALL    := /opt/ti-tools
-BASE_SABIOS     := $(BASE_INSTALL)/bios
+BASE_INSTALL    := SEDME_TITOOLS_BASEPATH
+BASE_SABIOS     := $(BASE_INSTALL)/SEDME_BIOSUNPACKDIR
 BASE_BUILDOS    := $(BASE_SABIOS)/packages/ti/bios
 
 #   ----------------------------------------------------------------------------
@@ -47,7 +47,7 @@ XDCTOOLS_DIR    := $(BASE_SABIOS)/xdctoo
 #   ----------------------------------------------------------------------------
 #   Base for code generation tools - compiler, linker, archiver etc.
 #   ----------------------------------------------------------------------------
-BASE_CGTOOLS    := $(BASE_INSTALL)/c6000/cgtools
+BASE_CGTOOLS    := $(BASE_INSTALL)/SEDME_CGTOOLSDIR
 BASE_CGTOOLSBIN := $(BASE_CGTOOLS)/bin
 
 #   ----------------------------------------------------------------------------
@@ -135,7 +135,7 @@ CC_SW_REL       := -o3
 #   ----------------------------------------------------------------------------
 #   Standard flags for the compiler
 #   ----------------------------------------------------------------------------
-STD_CC_FLAGS    := -q -pdr -pdv -pden -ml3 -mv6400 -d"CHIP_DM642"
+STD_CC_FLAGS    := SEDME_DSPFLAGS -d"CHIP_DM642"
 
 #   ----------------------------------------------------------------------------
 #   Standard flags for the compiler when building an executable
============================================================
--- packages/python/python-2.5.2/default-is-optimized.patch	524dcf57d51780fdc3c281c49f60fc03193204e0
+++ packages/python/python-2.5.2/default-is-optimized.patch	aeb51917d9c931269828e28f524ceb30e897d1c2
@@ -1,7 +1,7 @@
-Index: Python-2.5.1/Python/compile.c
+Index: Python-2.5.2/Python/compile.c
 ===================================================================
---- Python-2.5.1.orig/Python/compile.c
-+++ Python-2.5.1/Python/compile.c
+--- Python-2.5.2.orig/Python/compile.c
++++ Python-2.5.2/Python/compile.c
 @@ -30,7 +30,7 @@
  #include "symtable.h"
  #include "opcode.h"
@@ -11,3 +11,38 @@ Index: Python-2.5.1/Python/compile.c
  
  /*
    ISSUES:
+Index: Python-2.5.2/Modules/main.c
+===================================================================
+--- Python-2.5.2.orig/Modules/main.c
++++ Python-2.5.2/Modules/main.c
+@@ -40,7 +40,7 @@ static char **orig_argv;
+ static int  orig_argc;
+ 
+ /* command line options */
+-#define BASE_OPTS "c:dEhim:OQ:StuUvVW:xX?"
++#define BASE_OPTS "c:dEhim:ONQ:StuUvVW:xX?"
+ 
+ #ifndef RISCOS
+ #define PROGRAM_OPTS BASE_OPTS
+@@ -68,8 +68,7 @@ Options and arguments (and corresponding
+ ";
+ static char *usage_2 = "\
+ -m mod : run library module as a script (terminates option list)\n\
+--O     : optimize generated bytecode (a tad; also PYTHONOPTIMIZE=x)\n\
+--OO    : remove doc-strings in addition to the -O optimizations\n\
++-N     : do NOT optimize generated bytecode\n\
+ -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\
+ -S     : don't imply 'import site' on initialization\n\
+ -t     : issue warnings about inconsistent tab usage (-tt: issue errors)\n\
+@@ -302,7 +301,10 @@ Py_Main(int argc, char **argv)
+ 			break;
+ 
+ 		case 'O':
+-			Py_OptimizeFlag++;
++			fprintf(stderr, "-O is already default in this version. Ignoring\n");
++
++		case 'N':
++			Py_OptimizeFlag=0;
+ 			break;
+ 
+ 		case 'S':
============================================================
--- packages/python/python-evas_cvs.bb	004f170367e06ca113e955f686f51ce112ce9368
+++ packages/python/python-evas_cvs.bb	e10e5677f94c661d96f2145c6bf743dc44f4d217
@@ -3,6 +3,10 @@ PR = "r0"
 PV = "0.2.1+cvs${SRCDATE}"
 PR = "r0"
 
+do_compile_prepend() {
+	touch include/evas/__init__.py
+}
+
 do_stage() {
 	distutils_stage_all
 }
============================================================
--- packages/python/python_2.5.2.bb	5b3625881116fda1abd1f83093917137935991c8
+++ packages/python/python_2.5.2.bb	2bf6d846cc21654a0850a5e2bd3be1ecf5fb1c7a
@@ -6,7 +6,7 @@ DEPENDS_sharprom = "python-native readli
 DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
 # bump this on every change in contrib/python/generate-manifest-2.5.py
-PR = "ml4"
+PR = "ml6"
 
 PYTHON_MAJMIN = "2.5"
 
============================================================
--- packages/rsync/rsync.inc	1d1f2cbe00f4779bdc3dc7f9689611d817e90259
+++ packages/rsync/rsync.inc	fd74549f3564de106eb8cd72cdfabfbdf421e5c4
@@ -7,7 +7,7 @@ inherit autotools
 
 inherit autotools
 
-SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz"
+SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz"
 
 EXTRA_OEMAKE='STRIP=""'
 
============================================================
--- packages/rsync/rsync_2.6.9.bb	1b1f42efd8d5dc944a9638cd0678259c995c08dd
+++ packages/rsync/rsync_2.6.9.bb	b807b09cd2f7fb22a235f423eafea699f2886cdd
@@ -1,5 +1,5 @@ require rsync.inc
 require rsync.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://rsyncd.conf"
============================================================
--- packages/rsync/rsync_3.0.0.bb	dd9114bcedbdbe8b612946916a35fe4a662cd34c
+++ packages/rsync/rsync_3.0.0.bb	c591ba7b%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rdaafad010cbf738246a5e77122c2e1e4f951c9f5 -rb5b2a17fb6616a08cfa4b647c410de4e591fe97d
#
#
#
# patch "packages/linux/linux-omap2_git.bb"
#  from [ff518b2918e6c3e21ba577ec922a9cd1057e1d4b]
#    to [cea77c1d47097de58a869850834db878704774fc]
#
============================================================
--- packages/linux/linux-omap2_git.bb	ff518b2918e6c3e21ba577ec922a9cd1057e1d4b
+++ packages/linux/linux-omap2_git.bb	cea77c1d47097de58a869850834db878704774fc
@@ -2,9 +2,10 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
 
-SRCREV = "7786cd7a00ae0b18923185789380a88052f4eee7"
+SRCREV = "d3b3ae0fe6c71641da19c8de466ec366d39847e3"
 
-PV = "2.6.25+2.6.26-rc9+${PR}+git${SRCREV}"
+PV = "2.6.26"
+#PV = "2.6.25+2.6.26-rc9+${PR}+git${SRCREV}"
 PR = "r45"
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \

More information about the Openembedded-commits mailing list