merge of '57cc0ea5ac2c9fcb954fde9648313ceb7c4c1289'

     and '5a2c2dc85911ec398a156e49ad35c17c5534442f'

37 files changed, 453 insertions, 151 deletions

diff --git a/packages/gammu/files/.mtn2git_empty b/packages/chicken/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gammu/files/.mtn2git_empty
+++ b/packages/chicken/.mtn2git_empty
diff --git a/packages/chicken/chicken.inc b/packages/chicken/chicken.inc
new file mode 100644
index 0000000000..fbaf971f88
--- /dev/null
+++ b/packages/chicken/chicken.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "A compiler that translates Scheme source files to C, and an interpreter"
+HOMEPAGE = "http://www.call-with-current-continuation.org/"
+SECTION = "interpreters"
+PRIORITY = "optional"
+LICENSE = "BSD"
+
+SRC_URI = "http://www.call-with-current-continuation.org/chicken-${PV}.tar.gz" 
+
+inherit autotools
+
+do_install_append() {
+    install -d ${D}${docdir}/${P}
+    mv ${D}/${datadir}/chicken/doc ${D}${docdir}/${P}
+}
+
+do_stage() {
+    autotools_stage_all
+}
+
diff --git a/packages/chicken/chicken_2.6.bb b/packages/chicken/chicken_2.6.bb
new file mode 100644
index 0000000000..713552b3e9
--- /dev/null
+++ b/packages/chicken/chicken_2.6.bb
@@ -0,0 +1 @@
+require chicken.inc
diff --git a/packages/gif2png/.mtn2git_empty b/packages/dsplink/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gif2png/.mtn2git_empty
+++ b/packages/dsplink/.mtn2git_empty
diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb
new file mode 100644
index 0000000000..a822cf1be4
--- /dev/null
+++ b/packages/dsplink/dsplink_1.50.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "DSP Link for TI ARM/DSP processors"
+
+DEPENDS = "virtual/kernel"
+
+PR = "r0"
+
+# Get dsplink tarball from TI website, place in sources and calculate
+# md5sum
+# https://www-a.ti.com/downloads/sds_support/targetcontent/link/index.html
+SRC_URI ="http://install.tarball.in.source.dir/dsplink_1_50.tar.gz \
+"
+
+S = "${WORKDIR}/dsplink_1_50/dsplink"
+
+# Needed for buildscripts
+export DSPLINK = "${S}"
+
+do_configure () {
+}
+
+do_compile () {
+sh ${S}/etc/host/scripts/Linux/buildmodule.sh
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}" 
+
diff --git a/packages/gammu/files/ldflags-again.patch b/packages/gammu/files/ldflags-again.patch
deleted file mode 100644
index 90311e5f39..0000000000
--- a/packages/gammu/files/ldflags-again.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gammu-1.10.0/cfg/Makefile.glo
-===================================================================
---- gammu-1.10.0.orig/cfg/Makefile.glo	2007-03-30 17:55:18.000000000 +0200
-+++ gammu-1.10.0/cfg/Makefile.glo	2007-03-30 17:55:46.000000000 +0200
-@@ -152,7 +152,7 @@
-  
- $(TOPDIR)/gammu/gammu-shared: $(COMMON) $(GAMMU) $(TOPDIR)/common/$(LIBGAMMU_FULLNAME)
- 	@echo Linking gammu-shared
--	@$(CC) -L$(TOPDIR)/common -lGammu $(GAMMU_CFLAGS) $(GAMMU_LIBS) $(SMSD_LIBS) $(GAMMU) -o $(TOPDIR)/gammu/gammu-shared
-+	@$(CC) -L$(TOPDIR)/common -lGammu $(LDLIBS) $(GAMMU_CFLAGS) $(GAMMU_LIBS) $(SMSD_LIBS) $(GAMMU) -o $(TOPDIR)/gammu/gammu-shared
- 
- shared: $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) $(TOPDIR)/common/$(LIBGAMMU_STATIC) $(TOPDIR)/gammu/gammu-shared
-  
diff --git a/packages/gammu/gammu_1.17.0.bb b/packages/gammu/gammu_1.17.0.bb
deleted file mode 100644
index 65ab877495..0000000000
--- a/packages/gammu/gammu_1.17.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "GNU All Mobile Managment Utilities"
-SECTION = "console/network"
-DEPENDS = "bluez-libs cmake-native"
-LICENSE = "GPL"
-HOMEPAGE = "http://www.gammu.org/"
-PR = "r1"
-
-SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 "
-
-inherit pkgconfig
-
-do_configure() {
-    cd ${S} && CMAKE_C_COMPILER=${TARGET_OS}-gcc ./configure --prefix=${prefix} --enable-shared --enable-backup
-}
-
-do_compile () {
-        oe_runmake
-}
-
-do_install () {
-        oe_runmake install DESTDIR=${D}
-}
-
-do_stage() {
-        install -d ${STAGING_INCDIR}/gammu/
-        install -m 0644 build-configure/include/*.h ${STAGING_INCDIR}/gammu/
-
-        oe_libinstall -so -C build-configure/common libGammu ${STAGING_LIBDIR}
-        rm -f ./build-configure/pkgconfig/gammu.pc
-}
-
-PACKAGES =+ "libgammu"
-
-FILES_${PN} = "${bindir}/gammu"
-FILES_libgammu = "${libdir}/libGammu.so*"
diff --git a/packages/gammu/gammu_1.20.0.bb b/packages/gammu/gammu_1.20.0.bb
new file mode 100644
index 0000000000..617648c0a0
--- /dev/null
+++ b/packages/gammu/gammu_1.20.0.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "GNU All Mobile Managment Utilities"
+SECTION = "console/network"
+DEPENDS = "bluez-libs cmake-native"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gammu.org/"
+PR = "r1"
+
+SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 "
+
+# it is CMake based but when inherit cmake it builds static binary/library
+inherit autotools pkgconfig
+
+do_configure() {
+    cd ${S} && CMAKE_C_COMPILER=${TARGET_OS}-gcc ./configure --prefix=${prefix} --enable-shared --enable-backup
+}
+
+do_stage() {
+    autotools_stage_all
+}
+
+PACKAGES =+ "libgammu"
+
+FILES_${PN} = "${bindir}/gammu ${bindir}/jadmaker"
+FILES_${PN}-dev += "${bindir}/gammu-config"
+FILES_libgammu = "${libdir}/libGammu.so.*"
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty b/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
new file mode 100644
index 0000000000..878cb1dba9
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
@@ -0,0 +1,128 @@
+diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl
+--- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl	2008-01-04 19:01:35.000000000 +0100
+@@ -35,6 +35,7 @@
+ modified (Jul 2005) by Jaroslaw Zachwieja <grok\@filippa.org.uk>
+ modified (Dec 2005) by David Pollard <david dot pollard\@optusnet.com.au>
+ modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl>
++modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support)
+ Version svn-$Version
+ ";
+ 
+@@ -176,6 +177,25 @@
+       15812 => 3 ,
+       7906  => 2,
+       3953 => 1
++    },
++    openstreetmap_tah => {
++      256*576000 =>  1,
++      128*576000 =>  2,
++       64*576000 =>  3,
++       32*576000 =>  4,
++       16*576000 =>  5,
++        8*576000 =>  6,
++        4*576000 =>  7,
++        2*576000 =>  8,
++          576000 =>  9,
++          288000 => 10,
++          144000 => 11,
++           72000 => 12,
++           36000 => 13,
++           18000 => 14,
++           9000  => 15,
++            4500 => 16,
++            2250 => 17
+     }
+ };
+ 
+@@ -331,7 +351,6 @@
+     exit();
+ }
+ 
+-
+ # Verify that we have the options that we need 
+ pod2usage(1) if (&error_check);
+ 
+@@ -417,6 +436,13 @@
+     print "+-----------------------------------------------------------+\n";
+     print "| Landsat Maps are Copyright, .....   |\n";
+     print "| They are free for non commercial use.                     |\n";
++}elsif ( $mapserver eq 'openstreetmap_tah' ){
++    print "+-----------------------------------------------------------+\n";
++    print "| OpenStreetmap Maps are Copyright by the OpenStreetmap     |\n";
++    print "| project.                                                  |\n";
++    print "| They are free for use under the terms of the              |\n";
++    print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\"    |\n";
++    print "| license. See http://www.openstreetmap.org for details.    |\n";
+ } elsif ( ! $force) {
+     print "You are violating the map servers copyright!\n";
+     print "Are you sure you want to continue? [y|n] ";
+@@ -700,6 +726,11 @@
+     {
+ 	($url,$mapscale)=googlemap_url($lati,$long,$scale);
+     } 
++    elsif ( $mapserver eq 'openstreetmap_tah') 
++    {	
++	$filename=~s/\.gif/.png/;
++	($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale);
++    } 
+     else 
+     {
+ 	print "Unknown map sever :", $mapserver, "\n"; 
+@@ -935,6 +966,37 @@
+     return ($url,$mapscale);
+ }
+ 
++#############################################################################
++sub openstreetmap_tah_url($$$){
++    my $lati = shift;
++    my $long = shift;
++    my $scale = shift;
++
++    my $mapscale = $scale;
++    my $zoom = undef;
++    for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) {
++	next unless $s == $scale;
++	$zoom = $Scale2Zoom->{openstreetmap_tah}->{$s};
++	$mapscale = $s;
++	last;
++    }
++
++    unless ( $zoom ) {
++	print "Error calculating Zoomlevel for Scale: $scale\n";
++	return (undef,undef);
++    }
++
++    if ($debug) {
++	print "\n";
++	print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n";
++	print "lat: $lati\n";
++	print "lon: $long\n";
++    }
++
++    my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png";
++#   print "$url\n";
++    return ($url,$mapscale);
++}
+ 
+ #############################################################################
+ sub eniro_url($$$){
+@@ -2284,7 +2346,7 @@
+ =item B<--mapserver <MAPSERVER>>
+ 
+ Mapserver to download from. Default: 'expedia'.
+-Currently can use: landsat or expedia.
++Currently usable: landsat, expedia or openstreetmap_tah.
+ 
+ geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs, 
+ but they are !!!NOT!!!! in the right scale.
+@@ -2294,6 +2356,9 @@
+ 
+ landsat covers the whole world with satelite Photos
+ 
++openstreetmap_tah: Free maps from the OpenStreetmap Tiles@Home project, see 
++		   http://www.openstreetmap.org and http://tah.openstreetmap.org.
++
+ gov_au is for Australia
+ 
+ incrementp for japanese Maps
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
new file mode 100644
index 0000000000..c51c80931c
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
@@ -0,0 +1,18 @@
+Index: src/map_handler.c
+===================================================================
+--- aa/src/map_handler.c	(Revision 1699)
++++ aa/src/map_handler.c	(Revision 1700)
+@@ -660,9 +660,12 @@
+   if (maploaded)
+     gdk_pixbuf_unref (image);
+ 
++#ifdef MAPNIK
+   if ( !strcmp (filename,"mapnik") ) {
+ 	  limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
+-  } else {
++  } else 
++#endif
++  {
+ 	  limage = gdk_pixbuf_new_from_file (filename, NULL);
+ 	  if (limage == NULL)
+ 	    {
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
new file mode 100644
index 0000000000..c8c0fe9c6a
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
@@ -0,0 +1,96 @@
+diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am
+--- gpsdrive-2.10pre4.orig/src/Makefile.am	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/src/Makefile.am	2007-12-28 18:50:29.000000000 +0100
+@@ -14,14 +14,14 @@
+ 	-DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \
+ 	-DLIBDIR=\"${libdir}\" \
+ 	-DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \
+-	${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\
+-	-I/usr/include/ \
+-	-I/usr/local/include \
+-	-I/opt/boost_1_35/include/boost-1_35 \
+-	-I/usr/local/include/freetype2 \
+-	-I/usr/include/freetype2 \
++	${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}
++#	-I/usr/include/ \
++#	-I/usr/local/include \
++#	-I/opt/boost_1_35/include/boost-1_35 \
++#	-I/usr/local/include/freetype2 \
++#	-I/usr/include/freetype2 \
+ 	-I. \
+-	-L/usr/local/lib
++#	-L/usr/local/lib
+ 
+ #	-I/usr/include/dbus-1.0/ 
+ 
+diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure
+--- gpsdrive-2.10pre4.orig/configure	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/configure	2008-01-06 14:49:11.000000000 +0100
+@@ -35950,10 +35950,13 @@
+ #  Yep, its ebil, but I does not know better...
+ #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
+ # default on debian should be: /usr/share/perl5/
+-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
+ #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
+-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
+ 
++# hard code path for OpenEmbedded environment as I don't know a way
++# to detect it automatically
++PERL_PACKAGE_DIR="/usr/share/perl5"
+ 
+ ac_perl_modules="File::Basename "
+ # Make sure we have perl
+@@ -37840,11 +37843,11 @@
+ #    AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore')
+ #fi
+ 
+-if test -f /usr/include/mysql/mysql.h; then
+- CFLAGS="$CFLAGS -I/usr/include/mysql"
+-else
+- CFLAGS="$CFLAGS -Imysql"
+-fi
++#if test -f /usr/include/mysql/mysql.h; then
++# CFLAGS="$CFLAGS -I/usr/include/mysql"
++#else
++# CFLAGS="$CFLAGS -Imysql"
++#fi
+ 
+ CFLAGS="$CFLAGS $OPT_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
+diff -ur gpsdrive-2.10pre4.orig/configure.ac gpsdrive-2.10pre4/configure.ac
+--- gpsdrive-2.10pre4.orig/configure.ac	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/configure.ac	2008-01-06 14:48:50.000000000 +0100
+@@ -662,9 +662,12 @@
+ #  Yep, its ebil, but I does not know better...
+ #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
+ # default on debian should be: /usr/share/perl5/
+-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
+ #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
+-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
++# hard code path for OpenEmbedded environment as I don't know a way
++# to detect it automatically
++PERL_PACKAGE_DIR="/usr/share/perl5"
+ AC_SUBST(PERL_PACKAGE_DIR)
+ 
+ AC_PROG_PERL_MODULES(File::Basename , ,  AC_MSG_ERROR(Need Perl module File::Basename))
+@@ -719,11 +722,11 @@
+ #    AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') 
+ #fi
+ 
+-if test -f /usr/include/mysql/mysql.h; then
+- CFLAGS="$CFLAGS -I/usr/include/mysql"
+-else
+- CFLAGS="$CFLAGS -Imysql"
+-fi
++#if test -f /usr/include/mysql/mysql.h; then
++# CFLAGS="$CFLAGS -I/usr/include/mysql"
++#else
++# CFLAGS="$CFLAGS -Imysql"
++#fi
+ 
+ CFLAGS="$CFLAGS $OPT_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
new file mode 100644
index 0000000000..70af29dcad
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=GPSDrive
+Comment=GPS map software
+Exec=gpsdrive -M pda -1
+Terminal=false
+Type=Application
+Icon=gpsicon
+Categories=Graphics;Network;Geography;
+StartupNotify=false
diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb
new file mode 100644
index 0000000000..102a917c1f
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive_2.10pre4.bb
@@ -0,0 +1,33 @@
+require gpsdrive.inc
+
+DEPENDS += "libwww-perl-native libart-lgpl libxml2 cairo mysql"
+RDEPENDS_${PN} += "libwww-perl"
+
+PR = "r2"
+
+SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
+           file://gpsdrive_2.10pre4.desktop \
+           file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \
+           file://gpsdrive-ifdef-mapnik.patch;patch=1 \
+           file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1"
+
+do_install_append () {
+        mkdir -p  ${D}${datadir}/applications
+        install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop
+	mkdir -p ${D}${datadir}/pixmaps
+	cp ${D}${datadir}/${PN}/pixmaps/gpsicon.png ${D}${datadir}/pixmaps
+        # remove stuff we don't want to package
+        rm ${D}${datadir}/${PN}/gpsdrive.desktop # we have our own one
+        rm -rf ${D}${datadir}/${PN}/DSL # for Damn Small Linux
+        rm -rf ${D}${datadir}/${PN}/gentoo # for Gentoo
+}
+
+PACKAGES += "gpsdrive-maps gpsdrive-map-icons-classic gpsdrive-map-icons-other gpsdrive-addons"
+
+FILES_${PN} = "${bindir}/gpsdrive ${datadir}/applications ${datadir}/map-icons/icons.xml"
+FILES_${PN} += "${datadir}/pixmaps ${datadir}/${PN}/pixmaps ${datadir}/${PN}/poi"
+FILES_${PN}-addons = "${bindir}/*.pl ${bindir}/friendsd2 ${bindir}/geo* ${bindir}/*.sh ${bindir}/*.py ${bindir}/gpsreplay ${bindir}/gpssmswatch ${bindir}/wp* ${datadir}/mapnik ${datadir}/perl*/Geo ${datadir}/perl*/Utils"
+FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small"
+FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg"
+FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt"
+FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation"
diff --git a/packages/i2c-tools/.mtn2git_empty b/packages/i2c-tools/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/i2c-tools/.mtn2git_empty
diff --git a/packages/i2c-tools/i2c-tools_3.0.1.bb b/packages/i2c-tools/i2c-tools_3.0.1.bb
new file mode 100644
index 0000000000..c8ea32a5f1
--- /dev/null
+++ b/packages/i2c-tools/i2c-tools_3.0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Set of i2c tools for linux"
+SECTION = "base"
+LICENSE = "GPL"
+
+SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-${PV}.tar.bz2"
+
+inherit autotools
+
+do_compile_prepend() {
+        sed -i 's_/usr/local_/usr_' Makefile
+        sed -i 's_CC\t:= gcc_CC\t:= ${CC}_' Makefile
+}
diff --git a/packages/libopie/libopie2_1.2.3.bb b/packages/libopie/libopie2_1.2.3.bb
index 1ecc983b14..dc378d0646 100644
--- a/packages/libopie/libopie2_1.2.3.bb
+++ b/packages/libopie/libopie2_1.2.3.bb
@@ -1,10 +1,11 @@
 require ${PN}.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
-	   file://gcc-syntax-fix.patch;patch=1 \
-	   file://h4000_and_default_rot.patch;patch=1"
+           file://gcc-syntax-fix.patch;patch=1 \
+           file://h4000_and_default_rot.patch;patch=1 \
+           file://remove_h2200_rotate_fix.patch;patch=1"
 
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 b/packages/linux/linux-ixp4xx/defconfig-2.6.24.7
index 3a3b506d06..3a3b506d06 100644
--- a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4
+++ b/packages/linux/linux-ixp4xx/defconfig-2.6.24.7
diff --git a/packages/linux/linux-ixp4xx_2.6.24.4.bb b/packages/linux/linux-ixp4xx_2.6.24.7.bb
index 05aea212e0..7fbc621891 100644
--- a/packages/linux/linux-ixp4xx_2.6.24.4.bb
+++ b/packages/linux/linux-ixp4xx_2.6.24.7.bb
@@ -2,13 +2,13 @@ require linux.inc
 require linux-ixp4xx.inc
 
 VANILLA_VERSION = "2.6.24"
-KERNEL_RELEASE = "2.6.24.4"
+KERNEL_RELEASE = "2.6.24.7"
 
 # If you use a rc, you will need to use this:
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r2"
+# PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
 	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
diff --git a/packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch b/packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch
deleted file mode 100644
index 3f861ebf9d..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3f8441b4e1fc297caf5cf712c1bc3f506ec28065 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@openembedded.org>
-Date: Thu, 8 May 2008 18:30:41 +0200
-Subject: [PATCH] This patch adds RTC support to the omap3 based beagleboard
-
-Signed-off-by: Koen Kooi <koen@openembedded.org>
----
- arch/arm/mach-omap2/board-omap3beagle.c |   12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 626f004..0c0cbfc 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -58,13 +58,25 @@ static struct omap_mmc_config omap3beagle_mmc_config __initdata = {
- 	},
- };
- 
-+static struct platform_device omap3_beagle_twl4030rtc_device = {
-+	.name           = "twl4030_rtc",
-+	.id             = -1,
-+};
-+
- static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {
- 	{ OMAP_TAG_UART,	&omap3_beagle_uart_config },
- 	{ OMAP_TAG_MMC,		&omap3beagle_mmc_config },
- };
- 
-+static struct platform_device *omap3_beagle_devices[] __initdata = {
-+#ifdef CONFIG_RTC_DRV_TWL4030
-+	&omap3_beagle_twl4030rtc_device,
-+#endif
-+};
-+
- static void __init omap3_beagle_init(void)
- {
-+	platform_add_devices(omap3_beagle_devices, ARRAY_SIZE(omap3_beagle_devices));
- 	omap_board_config = omap3_beagle_config;
- 	omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
- 	omap_serial_init();
--- 
-1.5.4.3
-
diff --git a/packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch b/packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch
new file mode 100644
index 0000000000..55e9bf7b54
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch
@@ -0,0 +1,36 @@
+From eddf57fb9748791e021ef550d651cc72c48add5c Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@openembedded.org>
+Date: Thu, 15 May 2008 09:32:23 +0200
+Subject: [PATCH] ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code
+
+This patch fixes the merge-damage in the beagleboard RTC code
+
+Signed-off-by: Koen Kooi <koen@openembedded.org>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 0c15ca0..0c0cbfc 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -76,6 +76,7 @@ static struct platform_device *omap3_beagle_devices[] __initdata = {
+ 
+ static void __init omap3_beagle_init(void)
+ {
++	platform_add_devices(omap3_beagle_devices, ARRAY_SIZE(omap3_beagle_devices));
+ 	omap_board_config = omap3_beagle_config;
+ 	omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
+ 	omap_serial_init();
+@@ -88,8 +89,6 @@ arch_initcall(omap3_beagle_i2c_init);
+ 
+ static void __init omap3_beagle_map_io(void)
+ {
+-	platform_add_devices(omap3_beagle_devices,
+-				ARRAY_SIZE(omap3_beagle_devices));
+ 	omap2_set_globals_343x();
+ 	omap2_map_common_io();
+ }
+-- 
+1.5.4.3
+
diff --git a/packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch b/packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch
deleted file mode 100644
index d81f03880c..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Content-Type: text/plain; charset=ISO-8859-1; format=flowed
-Content-Transfer-Encoding: 7bit
-
-
-Enabling L2 cache of Cortex-A8 based OMAP3 has to be done by 
-bootloader. Check if this is done and warn if not.
-
-Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
-
-----
-
-Changes in v2: Fix a typo.
-
-Index: linux-beagle/arch/arm/mach-omap2/id.c
-===================================================================
---- linux-beagle.orig/arch/arm/mach-omap2/id.c
-+++ linux-beagle/arch/arm/mach-omap2/id.c
-@@ -267,3 +267,26 @@ void __init omap2_check_revision(void)
- 
- }
- 
-+#ifdef CONFIG_ARCH_OMAP3
-+/*
-+ * OMAP3 has L2 cache which has to be enabled by bootloader.
-+ */
-+static int __init omap3_check_l2cache(void)
-+{
-+	u32 val;
-+
-+	/* Get CP15 AUX register, bit 1 enabled indicates L2 cache is on */
-+	asm volatile("mrc p15, 0, %0, c1, c0, 1":"=r" (val));
-+
-+	if ((val & 0x2) == 0) {
-+		printk(KERN_WARNING "Warning: L2 cache not enabled. Check "
-+		       "your bootloader. L2 off results in performance loss\n");
-+	} else {
-+		pr_info("OMAP3 L2 cache enabled");
-+	}
-+
-+	return 0;
-+}
-+
-+arch_initcall(omap3_check_l2cache);
-+#endif /* CONFIG_ARCH_OMAP3 */
-
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 489682e711..356d26664a 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -2,10 +2,10 @@ require linux-omap.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
 
-SRCREV = "cb170dcdce58de20b045ae964a4ccfc29aad1647"
+SRCREV = "74c89552b4a5f9b5b066f74fa265248f9b5d3f1d"
 
-PV = "2.6.25+2.6.26-rc1+git${SRCREV}"
-PR = "r12"
+PV = "2.6.25+2.6.26-rc2+git${SRCREV}"
+PR = "r13"
 
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
@@ -13,10 +13,9 @@ SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
 
 SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
 			       file://usb-timout.patch;patch=1 \
-			       file://l2-cache.patch;patch=1 \ 	
-			       file://0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch;patch=1 \	
+			       file://l2-cache.patch;patch=1 \
+			       file://0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch;patch=1 \ 	
 			       file://0001-omap3beagle-add-driver-to-turn-on-the-TFP410-framer.patch;patch=1 \
-			       file://l2-cache-check.patch;patch=1 \
 "
 
 COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"
diff --git a/packages/linux/linux_2.6.23+2.6.24-rc5.bb b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
index 648fe6b756..d22d5e8f27 100644
--- a/packages/linux/linux_2.6.23+2.6.24-rc5.bb
+++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
@@ -2,7 +2,6 @@ require linux.inc
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_alix = "1"
 
 PR = "r3"
 
diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb
index aea1347767..ca15db543f 100644
--- a/packages/linux/linux_2.6.25.bb
+++ b/packages/linux/linux_2.6.25.bb
@@ -6,6 +6,7 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 DEFAULT_PREFERENCE_kilauea = "1"
 DEFAULT_PREFERENCE_sequoia = "1"
 DEFAULT_PREFERENCE_cm-x270 = "1"
+DEFAULT_PREFERENCE_alix = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \
            file://defconfig"
diff --git a/packages/nonworking/gif2png/.mtn2git_empty b/packages/nonworking/gif2png/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/gif2png/.mtn2git_empty
diff --git a/packages/gif2png/gif2png_2.5.1.bb b/packages/nonworking/gif2png/gif2png_2.5.1.bb
index 9ba886ecbd..9ba886ecbd 100644
--- a/packages/gif2png/gif2png_2.5.1.bb
+++ b/packages/nonworking/gif2png/gif2png_2.5.1.bb
diff --git a/packages/nonworking/guile/.mtn2git_empty b/packages/nonworking/guile/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/guile/.mtn2git_empty
diff --git a/packages/guile/guile-native_1.6.4.bb b/packages/nonworking/guile/guile-native_1.6.4.bb
index 4a3bc5e74e..4a3bc5e74e 100644
--- a/packages/guile/guile-native_1.6.4.bb
+++ b/packages/nonworking/guile/guile-native_1.6.4.bb
diff --git a/packages/openssl/openssl-native_0.9.7m.bb b/packages/openssl/openssl-native_0.9.7m.bb
index f48e123152..f030ca10dd 100644
--- a/packages/openssl/openssl-native_0.9.7m.bb
+++ b/packages/openssl/openssl-native_0.9.7m.bb
@@ -2,6 +2,14 @@ inherit pkgconfig native
 
 require openssl.inc
 
+# This flag can contain target options (e.g -mfpu=neon for armv7-a systems)
+export FULL_OPTIMIZATION = " "
+export BUILD_OPTIMIZATION = " "
+
+export CFLAG = " ${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
+                 -DTERMIO  "
+
+
 PR = "r2"
 
 SRC_URI += "file://debian.patch;patch=1 \
diff --git a/packages/openssl/openssl-native_0.9.8g.bb b/packages/openssl/openssl-native_0.9.8g.bb
index e491cc0e18..e0fe33c9f9 100644
--- a/packages/openssl/openssl-native_0.9.8g.bb
+++ b/packages/openssl/openssl-native_0.9.8g.bb
@@ -1,7 +1,16 @@
 inherit pkgconfig native
 
+DEFAULT_PREFERENCE = "-1"
+
 require openssl.inc
 
+# This flag can contain target options (e.g -mfpu=neon for armv7-a systems)
+export FULL_OPTIMIZATION = " "
+export BUILD_OPTIMIZATION = " "
+
+export CFLAG = " ${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
+                 -DTERMIO  "
+
 SRC_URI += "file://debian.patch;patch=1 \
             file://configure-targets.patch;patch=1 \
             file://shared-libs.patch;patch=1"
diff --git a/packages/perl/libwww-perl-native_5.808.bb b/packages/perl/libwww-perl-native_5.808.bb
new file mode 100644
index 0000000000..68fdcbbbe5
--- /dev/null
+++ b/packages/perl/libwww-perl-native_5.808.bb
@@ -0,0 +1,5 @@
+SECTION = "libs"
+
+inherit native
+
+require libwww-perl_${PV}.bb
diff --git a/packages/perl/libwww-perl_5.808.bb b/packages/perl/libwww-perl_5.808.bb
new file mode 100644
index 0000000000..2bea48a2d0
--- /dev/null
+++ b/packages/perl/libwww-perl_5.808.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web"
+SECTION = "libs"
+LICENSE = "Artistic"
+DEPENDS = "liburi-perl-native"
+RDEPENDS = "liburi-perl"
+PR = "r1"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz"
+
+S = "${WORKDIR}/libwww-perl-${PV}"
+
+inherit cpan
diff --git a/packages/python/python-gammu_0.24.bb b/packages/python/python-gammu_0.26.bb
index f8989d9181..f8989d9181 100644
--- a/packages/python/python-gammu_0.24.bb
+++ b/packages/python/python-gammu_0.26.bb
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index 9b69b00b48..6f0b1344b3 100644
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -47,6 +47,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m
 	   file://kernel-keymap-corgi.patch;patch=1 \
 	   file://kernel-asm-page.patch;patch=1 \
 	   file://remove-unused-kbdhandler.patch;patch=1 \
+	   file://disable-dup-rotation.patch;patch=1 \
 	   file://sharp_char.h \
 	   file://switches.h "
 
diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb
index d9c3de136f..9e3ee5c584 100644
--- a/packages/qte/qte-mt_2.3.10.bb
+++ b/packages/qte/qte-mt_2.3.10.bb
@@ -1,5 +1,5 @@
 require qte-common_${PV}.inc
-PR = "r25"
+PR = "r26"
 
 EXTRA_OECONF += "-thread"
 
diff --git a/packages/tasks/task-sdk-opie.bb b/packages/tasks/task-sdk-opie.bb
index 0c4c1f6558..a38e58385f 100644
--- a/packages/tasks/task-sdk-opie.bb
+++ b/packages/tasks/task-sdk-opie.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK packages for Opie"
-PR = "r6"
+PR = "r7"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -12,7 +12,7 @@ RDEPENDS_task-sdk-opie = "\
     libopienet2 \
     libopiepim2 \
     libopieui2 \
-    libqpe1 \
+    libqpe-opie \
     qte \
     libqtaux2 \
     libmailwrapper"