From 3d7691139658cbf76577f0a3cde86b07dcd6d14b Mon Sep 17 00:00:00 2001
From: Openmoko anonymizer key <devel@lists.openmoko.org>
Date: Tue, 11 Dec 2007 16:49:11 +0000
Subject: change to rev 3630.

---
 packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
index b96cf8fa74..1526cbab55 100644
--- a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
+++ b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
@@ -4,7 +4,7 @@ PACKAGE_ARCH = "all"
 SRC_URI = "svn://svn.openmoko.org/developers/john_lee;module=toolkit;proto=http"
 SRC_URI += "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/applications;module=openmoko-sample2;proto=http"
 
-SRCREV="3563"
+SRCREV="3630"
 FILES_${PN} = "/"
 
 do_install () {
-- 
cgit v1.2.3


From afc67e8fe03d33a1a771475d0bbcb7986b9d2aae Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 13 Dec 2007 06:58:34 +0000
Subject: fix sourcepkg minor error.  make it possible to inherit in .bb

---
 classes/sourcepkg.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
index 390d3684d4..bbc9f187ec 100644
--- a/classes/sourcepkg.bbclass
+++ b/classes/sourcepkg.bbclass
@@ -106,6 +106,6 @@ EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
 
 addtask create_orig_tgz after do_unpack before do_patch
 addtask archive_bb after do_patch before do_dumpdata
-addtask dumpdata after archive_bb before do_create_diff_gz
+addtask dumpdata after do_archive_bb before do_create_diff_gz
 addtask create_diff_gz after do_dump_data before do_configure
 
-- 
cgit v1.2.3


From 8b3f5e14259bcb2bc9872577238754f5372b443a Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 13 Dec 2007 07:00:43 +0000
Subject: patch moko-autorev.inc to reflect the removal of OM2007 in svn by
 comment out the obsolete items.

---
 conf/distro/include/moko-autorev.inc | 47 ++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 0e29c19c5c..348234e789 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -10,56 +10,56 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
 
-SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-common ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-common ?= "${AUTOREV}"
 SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-contacts ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-contacts ?= "${AUTOREV}"
 SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dates ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-dates ?= "${AUTOREV}"
 SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dialer ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-dialer ?= "${AUTOREV}"
 SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}"
 SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-footer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-footer ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
 SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
 SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
-SRCREV_pn-openmoko-session ?= "${AUTOREV}"
-SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-session ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
-SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
-SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
 SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-today ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-today ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
@@ -72,4 +72,3 @@ SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
 SRCREV_pn-usbpath ?= "${AUTOREV}"
 SRCREV_pn-usbpath-native ?= "${AUTOREV}"
-
-- 
cgit v1.2.3


From a60198d94c77b96ed3fc8c1bfee24432fec4412d Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 13 Dec 2007 08:58:40 +0000
Subject: missed SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}"

---
 conf/distro/include/moko-autorev.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 348234e789..85376da766 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -39,7 +39,7 @@ SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}"
 #SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
-- 
cgit v1.2.3


From 1c38032b62c2e76be0f2f7c80a8231cf95acab6d Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 13 Dec 2007 09:50:15 +0000
Subject: fix bugzilla #882

---
 packages/base-files/base-files/fic-gta01/fstab | 2 --
 packages/base-files/base-files/fic-gta02/fstab | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/base-files/base-files/fic-gta01/fstab b/packages/base-files/base-files/fic-gta01/fstab
index 4a0cc7750d..e5acb6a1eb 100644
--- a/packages/base-files/base-files/fic-gta01/fstab
+++ b/packages/base-files/base-files/fic-gta01/fstab
@@ -6,10 +6,8 @@ proc		/proc		proc	defaults		0  0
 # usb?
 
 # Temporary
-tmpfs		/tmp		tmpfs   defaults        	0  0
 tmpfs		/var/volatile	tmpfs   mode=0755        	0  0
 tmpfs		/dev/shm		tmpfs	mode=0777			0  0
-tmpfs		/media/ram	tmpfs	defaults		0  0
 
 # microSD slot
 /dev/mmcblk0p1	/media/card	auto	defaults,async,noauto	0  0
diff --git a/packages/base-files/base-files/fic-gta02/fstab b/packages/base-files/base-files/fic-gta02/fstab
index 4a0cc7750d..e5acb6a1eb 100644
--- a/packages/base-files/base-files/fic-gta02/fstab
+++ b/packages/base-files/base-files/fic-gta02/fstab
@@ -6,10 +6,8 @@ proc		/proc		proc	defaults		0  0
 # usb?
 
 # Temporary
-tmpfs		/tmp		tmpfs   defaults        	0  0
 tmpfs		/var/volatile	tmpfs   mode=0755        	0  0
 tmpfs		/dev/shm		tmpfs	mode=0777			0  0
-tmpfs		/media/ram	tmpfs	defaults		0  0
 
 # microSD slot
 /dev/mmcblk0p1	/media/card	auto	defaults,async,noauto	0  0
-- 
cgit v1.2.3


From ec163abdb68da4938ee7ee153995fc680100a2b5 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 13 Dec 2007 09:58:00 +0000
Subject: roadmap: 1st round of updating roadmap recipies after moving zroadmap
 over to roadmap * refactor, unify. roadmap.inc (global), zroadmap.in (qt
 global) * add common qt patches >= 1.1.0 to files/qt * add zroadmap_1.1.0.bb,
 update zroadmap_cvs.bb (set temp local SRCDATE) * config: remove popt (used
 for building maps) from DEPEND in *.bb * config:
 s/OE_QMAKE_CXXFLAG/OE_QMAKE_CFLAG in zroadmap 1.1.0 and cvs * install: add
 missing icons to *.bb * many small changes ** next round of updates will make
 gtk2 version of roadmap kosher

---
 packages/roadmap/files/qt/.mtn2git_empty        |   0
 packages/roadmap/files/qt/qt2-fixes.patch       |  10 ++++
 packages/roadmap/files/qt/qt_canvas.patch       |  20 ++++++++
 packages/roadmap/files/qt/qt_main.patch         |  61 ++++++++++++++++++++++++
 packages/roadmap/files/qt/roadmap.desktop.patch |  16 +++++++
 packages/roadmap/files/qt/roadmap_main.patch    |  16 +++++++
 packages/roadmap/files/zroadgps.png             | Bin 0 -> 1949 bytes
 packages/roadmap/roadmap-gtk2_cvs.bb            |  15 ++----
 packages/roadmap/roadmap.inc                    |   7 +++
 packages/roadmap/zroadmap-1.0.12/zroadgps.png   | Bin 1949 -> 0 bytes
 packages/roadmap/zroadmap.inc                   |  13 +++++
 packages/roadmap/zroadmap_1.0.12.bb             |  38 ++++-----------
 packages/roadmap/zroadmap_1.1.0.bb              |  40 ++++++++++++++++
 packages/roadmap/zroadmap_cvs.bb                |  44 +++++++----------
 14 files changed, 212 insertions(+), 68 deletions(-)
 create mode 100644 packages/roadmap/files/qt/.mtn2git_empty
 create mode 100644 packages/roadmap/files/qt/qt2-fixes.patch
 create mode 100644 packages/roadmap/files/qt/qt_canvas.patch
 create mode 100644 packages/roadmap/files/qt/qt_main.patch
 create mode 100644 packages/roadmap/files/qt/roadmap.desktop.patch
 create mode 100644 packages/roadmap/files/qt/roadmap_main.patch
 create mode 100644 packages/roadmap/files/zroadgps.png
 create mode 100644 packages/roadmap/roadmap.inc
 delete mode 100644 packages/roadmap/zroadmap-1.0.12/zroadgps.png
 create mode 100644 packages/roadmap/zroadmap.inc
 create mode 100644 packages/roadmap/zroadmap_1.1.0.bb

diff --git a/packages/roadmap/files/qt/.mtn2git_empty b/packages/roadmap/files/qt/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/roadmap/files/qt/qt2-fixes.patch b/packages/roadmap/files/qt/qt2-fixes.patch
new file mode 100644
index 0000000000..63c1c96e53
--- /dev/null
+++ b/packages/roadmap/files/qt/qt2-fixes.patch
@@ -0,0 +1,10 @@
+--- src/qt/Makefile~qt2-fixes.patch
++++ src/qt/Makefile
+@@ -19,7 +19,7 @@
+ 
+ ifeq ($(DESKTOP),QPE)
+    CFLAGS += -I$(QTDIR)/include -DQWS
+-   LIBS += -lqte -lqpe
++   LIBS += -lqpe
+    INSTALLDIR=$(QTDIR)
+ endif
diff --git a/packages/roadmap/files/qt/qt_canvas.patch b/packages/roadmap/files/qt/qt_canvas.patch
new file mode 100644
index 0000000000..13c775c8cb
--- /dev/null
+++ b/packages/roadmap/files/qt/qt_canvas.patch
@@ -0,0 +1,20 @@
+--- src/qt/qt_canvas.cc.old	2007-12-08 20:29:52.000000000 -0600
++++ src/qt/qt_canvas.cc	2007-12-13 02:34:22.000000000 -0600
+@@ -122,7 +122,7 @@ void RMapCanvas::getTextExtents(const ch
+    *w = r.width();
+    *ascent = fm.ascent();
+    *descent = fm.descent();
+-#ifdef QT_NO_ROTATE
++#ifdef QT_NO_TRANSFORMATIONS
+    if (can_tilt) *can_tilt = 0;
+ #else
+    if (can_tilt) *can_tilt = 1;
+@@ -169,7 +169,7 @@ void RMapCanvas::drawString(RoadMapGuiPo
+ 
+ void RMapCanvas::drawStringAngle(RoadMapGuiPoint* position,
+       int center, const char* text, int angle) {
+-#ifndef QT_NO_ROTATE
++#ifndef QT_NO_TRANSFORMATIONS
+    if (!pixmap) {
+       return;
+    }
diff --git a/packages/roadmap/files/qt/qt_main.patch b/packages/roadmap/files/qt/qt_main.patch
new file mode 100644
index 0000000000..2f81128b34
--- /dev/null
+++ b/packages/roadmap/files/qt/qt_main.patch
@@ -0,0 +1,61 @@
+--- src/qt/qt_main.cc.old	2007-12-08 20:32:34.000000000 -0600
++++ src/qt/qt_main.cc	2007-12-08 20:34:38.000000000 -0600
+@@ -27,6 +27,7 @@
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <unistd.h>
+ #include "qt_main.h"
+ 
+ static int signalFd[2];
+@@ -168,12 +169,6 @@ void RMapMainWindow::addTool(const char*
+                              const char* tip,
+                              RoadMapCallback callback) {
+ 
+-#ifndef QWS
+-   // For some unknown reason, this toolbar crashes RoadMap
+-   // on the Sharp Zaurus.
+-   // This should be fixed and the ifndef removed.
+-   // Pascal: I believe this has been fixed now.
+-
+    if (toolBar == 0) {
+       addToolbar("");
+    }
+@@ -193,20 +188,13 @@ void RMapMainWindow::addTool(const char*
+ 
+       connect(b, SIGNAL(clicked()), cb, SLOT(fire()));
+    }
+-#endif
+ }  
+ 
+ void RMapMainWindow::addToolSpace(void) {
+ 
+-#ifndef QWS
+-   // For some unknown reason, this toolbar crashes RoadMap
+-   // on the Sharp Zaurus. This should be fixed and the ifndef
+-   // removed.
+-
+    addTool (NULL, NULL, NULL, NULL);
+ 
+    toolBar->addSeparator();
+-#endif
+ }
+ 
+ 
+@@ -299,14 +287,14 @@ void RMapMainWindow::closeEvent(QCloseEv
+ 
+ void RMapMainWindow::signalHandler(int sig)
+ {
+-  ::write(signalFd[0], &sig, sizeof(sig));
++  write(signalFd[0], &sig, sizeof(sig));
+ }
+ 
+ void RMapMainWindow::handleSignal()
+ {
+   snSignal->setEnabled(false);
+   int tmp;
+-  ::read(signalFd[1], &tmp, sizeof(tmp));
++  read(signalFd[1], &tmp, sizeof(tmp));
+   QString action;
+   switch (tmp) {
+     case SIGTERM: action="SIGTERM"; break;
diff --git a/packages/roadmap/files/qt/roadmap.desktop.patch b/packages/roadmap/files/qt/roadmap.desktop.patch
new file mode 100644
index 0000000000..98d5b06130
--- /dev/null
+++ b/packages/roadmap/files/qt/roadmap.desktop.patch
@@ -0,0 +1,16 @@
+--- src/roadmap.desktop.old	2007-12-08 23:15:45.000000000 -0600
++++ src/roadmap.desktop	2007-12-08 23:17:48.000000000 -0600
+@@ -1,11 +1,8 @@
+ [Desktop Entry]
+-Comment=RoadMap
+ Comment=Car Navigation System
+ Exec=roadmap
+-Icon=roadmap.png
++Icon=roadmap
+ Type=Application
+ Name=RoadMap
+ GenericName=Map Viewer
+-Categories=Application;Other;VectorGraphics;Graphics;Viewer;GTK;
+-FilePattern=*roadmap;*.rdm
+-
++Categories=VectorGraphics;Graphics;Viewer;GTK;
diff --git a/packages/roadmap/files/qt/roadmap_main.patch b/packages/roadmap/files/qt/roadmap_main.patch
new file mode 100644
index 0000000000..7b16ce28fc
--- /dev/null
+++ b/packages/roadmap/files/qt/roadmap_main.patch
@@ -0,0 +1,16 @@
+--- src/qt/roadmap_main.cc.old	2007-12-08 15:47:05.000000000 -0600
++++ src/qt/roadmap_main.cc	2007-12-07 20:39:15.000000000 -0600
+@@ -195,11 +195,11 @@ void roadmap_main_set_cursor (int newcur
+          break;
+ 
+       case ROADMAP_CURSOR_WAIT:
+-         mainWindow->setCursor (QCursor(Qt::WaitCursor));
++         mainWindow->setCursor (QCursor(Qt::waitCursor));
+          break;
+ 
+       case ROADMAP_CURSOR_CROSS:
+-         mainWindow->setCursor (QCursor(Qt::CrossCursor));
++         mainWindow->setCursor (QCursor(Qt::crossCursor));
+          break;
+       }
+    }
diff --git a/packages/roadmap/files/zroadgps.png b/packages/roadmap/files/zroadgps.png
new file mode 100644
index 0000000000..a77b3729b7
Binary files /dev/null and b/packages/roadmap/files/zroadgps.png differ
diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb
index cb81a44ae8..557c4a1096 100644
--- a/packages/roadmap/roadmap-gtk2_cvs.bb
+++ b/packages/roadmap/roadmap-gtk2_cvs.bb
@@ -1,13 +1,8 @@
-DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
-It displays a map of the streets, tracks the position provided by a NMEA-compliant \
-GPS receiver, identifies the street matching this GPS position and announces the name \
-of the crossing street at the next intersection."
-AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
-HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
-DEPENDS = "popt expat gtk+"
-LICENSE = "GPL"
+require roadmap.inc
+
+DEPENDS = "expat gtk+"
 PV = "1.0.12+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
            file://cross.patch;patch=1;pnum=2 \
@@ -16,7 +11,6 @@ SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
 
 S = "${WORKDIR}/roadmap/src"
 
-PARALLEL_MAKE = ""
 CFLAGS += " -I${S} "
 
 
@@ -39,6 +33,5 @@ do_install() {
 	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
 }
 
-
 FILES_${PN} += "${datadir}/roadmap"
 
diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc
new file mode 100644
index 0000000000..43577badb9
--- /dev/null
+++ b/packages/roadmap/roadmap.inc
@@ -0,0 +1,7 @@
+DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX." 
+PRIORITY = "optional"
+AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
+HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
+LICENSE = "GPL"
+
+PARALLEL_MAKE = ""
diff --git a/packages/roadmap/zroadmap-1.0.12/zroadgps.png b/packages/roadmap/zroadmap-1.0.12/zroadgps.png
deleted file mode 100644
index a77b3729b7..0000000000
Binary files a/packages/roadmap/zroadmap-1.0.12/zroadgps.png and /dev/null differ
diff --git a/packages/roadmap/zroadmap.inc b/packages/roadmap/zroadmap.inc
new file mode 100644
index 0000000000..acee708837
--- /dev/null
+++ b/packages/roadmap/zroadmap.inc
@@ -0,0 +1,13 @@
+require roadmap.inc
+
+SECTION = "opie/applications"
+
+inherit palmtop
+
+QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
+QT_LIBRARY_append_c7x0 = " -laticore"
+
+do_configure() {
+	echo removing pregenerated stuff
+	find . -name "moc*"|xargs rm -f
+}
diff --git a/packages/roadmap/zroadmap_1.0.12.bb b/packages/roadmap/zroadmap_1.0.12.bb
index 5b9161cfce..9a7b73d1a1 100644
--- a/packages/roadmap/zroadmap_1.0.12.bb
+++ b/packages/roadmap/zroadmap_1.0.12.bb
@@ -1,15 +1,6 @@
-DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
-It displays a map of the streets, tracks the position provided by a NMEA-compliant \
-GPS receiver, identifies the street matching this GPS position and announces the name \
-of the crossing street at the next intersection. A rudimentary trip feature allows \
-RoadMap to display some basic navigation information (distance to the destination, \
-direction, speed, etc..). Voice messages are generated that duplicate some of the screen information."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
-HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
-LICENSE = "GPL"
-PR = "r0"
+require zroadmap.inc
+
+PR = "r1"
 
 SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \
            file://qt2-fixes.patch;pnum=2;patch=1 \
@@ -17,20 +8,9 @@ SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.
            file://zroadgps.png"
 S = "${WORKDIR}/roadmap-${PV}/src"
 
-inherit palmtop
-
-QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
-QT_LIBRARY_append_c7x0 = " -laticore"
-
 EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \
                 GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \
                 GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"'
-PARALLEL_MAKE = ""
-
-do_configure() {
-	echo removing pregenerated stuff
-	find . -name "moc*"|xargs rm -f
-}
 
 do_compile() {
 	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a
@@ -38,16 +18,16 @@ do_compile() {
 }
 
 do_install() {
-	cd qt
         install -d ${D}${palmtopdir}/bin
 	install -d ${D}${palmtopdir}/apps/Applications
 	install -d ${D}${palmtopdir}/pics
-        install -m 0755 qtroadmap ${D}${palmtopdir}/bin/roadmap
-	install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps
-	install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
+        install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
+	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
+        install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
+	install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
 	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
-        install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
+        install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
 	install -d ${D}${palmtopdir}/share/roadmap/
-        install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/
+        install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/
 	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
 }
diff --git a/packages/roadmap/zroadmap_1.1.0.bb b/packages/roadmap/zroadmap_1.1.0.bb
new file mode 100644
index 0000000000..42184ce62b
--- /dev/null
+++ b/packages/roadmap/zroadmap_1.1.0.bb
@@ -0,0 +1,40 @@
+require zroadmap.inc
+
+DEPENDS += "expat"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
+           file://cross.patch;patch=1;pnum=2 \
+           file://qt/qt2-fixes.patch;patch=1 \
+           file://qt/qt_canvas.patch;patch=1 \
+           file://qt/qt_main.patch;patch=1 \
+           file://qt/roadmap_main.patch;patch=1 \
+           file://qt/roadmap.desktop.patch;patch=1 \
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \
+           file://zroadgps.png"
+S = "${WORKDIR}/roadmap-${PV}/src"
+
+EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \
+                CFLAGS="-DQWS -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
+                LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
+
+do_compile() {
+	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
+	oe_runmake -C gpx libgpx.a
+	oe_runmake -C unix libosroadmap.a
+	oe_runmake -C qt qtroadmap qtroadgps
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/apps/Applications
+	install -d ${D}${palmtopdir}/pics
+        install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
+	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
+	install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
+        install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/
+	install -d ${D}${palmtopdir}/share/roadmap/
+        install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/
+	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
+}
diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb
index fd9cc5e95f..5b39faf071 100644
--- a/packages/roadmap/zroadmap_cvs.bb
+++ b/packages/roadmap/zroadmap_cvs.bb
@@ -1,36 +1,24 @@
-DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
-It displays a map of the streets, tracks the position provided by a NMEA-compliant \
-GPS receiver, identifies the street matching this GPS position and announces the name \
-of the crossing street at the next intersection."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
-HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
-DEPENDS = "popt expat"
-LICENSE = "GPL"
-PV = "1.0.12+cvs-${SRCDATE}"
+require zroadmap.inc
+
+DEPENDS += "expat"
+SRCDATE = "20071212"
+PV = "1.1.0+cvs-${SRCDATE}"
 PR = "r0"
 
 SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
-           file://qt2-fixes-r1.patch;pnum=1;patch=1 \
-           http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
+           file://cross.patch;patch=1;pnum=2 \
+           file://qt/qt2-fixes.patch;patch=1 \
+           file://qt/qt_canvas.patch;patch=1 \
+#upstream  file://qt/qt_main.patch;patch=1 \
+           file://qt/roadmap_main.patch;patch=1 \
+#upstream  file://qt/roadmap.desktop.patch;patch=1 \
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \
            file://zroadgps.png"
 S = "${WORKDIR}/roadmap/src"
 
-inherit palmtop
-
-QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
-QT_LIBRARY_append_c7x0 = " -laticore"
-
 EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \
-                CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
+                CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
                 LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
-PARALLEL_MAKE = ""
-
-do_configure() {
-	echo removing pregenerated stuff
-	find . -name "moc*"|xargs rm -f
-}
 
 do_compile() {
 	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
@@ -45,10 +33,10 @@ do_install() {
 	install -d ${D}${palmtopdir}/pics
         install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
 	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
-	install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
+	install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
 	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
-        install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
+        install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/
 	install -d ${D}${palmtopdir}/share/roadmap/
-        install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/
+        install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/
 	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
 }
-- 
cgit v1.2.3


From 545938e94acaeaa7985afdc0f349dee755847de8 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Thu, 13 Dec 2007 15:31:07 +0000
Subject: initramfs-module-bootmenu 1.0: RRECOMMENDS NLS modules required for
 vfat mounting.

---
 packages/initrdscripts/initramfs-module-bootmenu_1.0.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
index 002acff0a9..e90247c522 100644
--- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
@@ -1,7 +1,9 @@
 SRC_URI = "file://30-bootmenu.sh"
-PR = "r3"
-RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop"
+PR = "r4"
 DESCRIPTION = "An initramfs module with UI for selection of boot device."
+RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop"
+# For VFAT mounting.
+RRECOMMENDS = "kernel-module-nls-cp437 kernel-module-nls-iso8859-1"
 
 do_install() {
 	install -d ${D}/initrd.d
-- 
cgit v1.2.3


From f68e25bb2d1d3bf2ce83c4abc9997557ec4eb5c8 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 13 Dec 2007 15:31:51 +0000
Subject: moko-autorev.inc: remove openmoko 2007.1 stuff (won't receive
 updates)

---
 conf/distro/include/moko-autorev.inc | 22 ----------------------
 conf/distro/include/sane-srcrevs.inc |  1 +
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 316fc5a4de..2cc722f013 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -10,31 +10,19 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
 
-SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-common ?= "${AUTOREV}"
 SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-contacts ?= "${AUTOREV}"
 SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dates ?= "${AUTOREV}"
 SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dialer ?= "${AUTOREV}"
 SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}"
 SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-footer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
 SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
 SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
@@ -46,21 +34,11 @@ SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-session ?= "${AUTOREV}"
-SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
-SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
-SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
 SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-today ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index dff8d89328..2a3017afdf 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -94,6 +94,7 @@ SRCREV_pn-openmoko-panel-gps ?= "2900"
 SRCREV_pn-openmoko-panel-gsm ?= "3256"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "3360"
+SRCREV_pn-openmoko-sample2 ?= "3528"
 SRCREV_pn-openmoko-session ?= "152"
 SRCREV_pn-openmoko-sample2 ?= "3537"
 SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
-- 
cgit v1.2.3


From 9446fabed66082e46191b788c46969d9d4ac858f Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 13 Dec 2007 17:08:09 +0000
Subject: libart: add config file for armeb, closes #3469

---
 packages/gnome/libart-lgpl/armeb/.mtn2git_empty |  0
 packages/gnome/libart-lgpl/armeb/art_config.h   | 10 ++++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 packages/gnome/libart-lgpl/armeb/.mtn2git_empty
 create mode 100644 packages/gnome/libart-lgpl/armeb/art_config.h

diff --git a/packages/gnome/libart-lgpl/armeb/.mtn2git_empty b/packages/gnome/libart-lgpl/armeb/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gnome/libart-lgpl/armeb/art_config.h b/packages/gnome/libart-lgpl/armeb/art_config.h
new file mode 100644
index 0000000000..b0e74ad6ae
--- /dev/null
+++ b/packages/gnome/libart-lgpl/armeb/art_config.h
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
-- 
cgit v1.2.3


From 797990ba0f2ebd7b153e54e095d42927642ae27d Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 13 Dec 2007 17:13:25 +0000
Subject: angstrom autobuilder: add meta-angstrom-2007

---
 contrib/angstrom/build-release.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 5f885b1377..79bb97e0de 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -36,6 +36,7 @@ do_report_success() {
 for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk
 do
 	BUILD_MACHINE=$machine
+	BUILD_CLEAN="libtool-cross"
 	BUILD_TARGETS="minimal-image console-image"
 	do_build
 done
@@ -59,7 +60,7 @@ done
 for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie 
 do
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="minimal-image console-image x11-image"
+	BUILD_TARGETS="minimal-image console-image minimal-gpe-image x11-image"
 	do_build
 done
 
@@ -76,16 +77,25 @@ done
 for machine in fic-gta01 a780 
 do
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="openmoko-image"
+	BUILD_TARGETS="minimal-openmoko-image openmoko-image"
 	BUILD_CLEAN="qmake2-native"
 	do_build
 done	
 
-#native toolchain
+# populate feeds
 for machine in ep93xx a780 efika collie ixp4xxbe
 do
         BUILD_MACHINE=$machine
-        BUILD_TARGETS="gcc binutils pkgconfig make automake autoconf libtool m4 perl python gdb strace screen"
+        BUILD_TARGETS="meta-angstrom-2007"
         do_build
 done
 
+#cross toolchain
+#for machine in ep93xx a780 efika collie ixp4xxbe
+#do
+#        BUILD_MACHINE=$machine
+#        BUILD_TARGETS="meta-toolchain"
+#	BUILD_CLEAN="meta-toolchain"
+#        do_build
+#done
+
-- 
cgit v1.2.3


From e8e8079c03ede45d1ec0d2a0fd4c0f1ae167d956 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 13 Dec 2007 22:58:13 +0000
Subject: libgsmd svn add gta02 specific version

---
 packages/gsm/files/default                  |  8 ++++-
 packages/gsm/files/fic-gta02/.mtn2git_empty |  0
 packages/gsm/files/fic-gta02/gsmd           | 49 +++++++++++++++++++++++++++++
 packages/gsm/gsmd.inc                       |  1 -
 packages/gsm/libgsmd-devel_svn.bb           |  2 ++
 packages/gsm/libgsmd_svn.bb                 |  2 ++
 6 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 packages/gsm/files/fic-gta02/.mtn2git_empty
 create mode 100644 packages/gsm/files/fic-gta02/gsmd

diff --git a/packages/gsm/files/default b/packages/gsm/files/default
index 761100f702..d4014611d9 100644
--- a/packages/gsm/files/default
+++ b/packages/gsm/files/default
@@ -3,12 +3,18 @@
 . /etc/init.d/functions
 
 case `cpuinfo_id` in
-	"GTA01"|"GTA02")
+	"GTA01")
 		GSMD_OPTS="-s 115200 -F"
 		GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
 		GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset"
 		GSM_DEV="/dev/ttySAC0"
 		;;
+    "GTA02")
+        GSMD_OPTS="-s 115200 -F"
+        GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
+        GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset"
+        GSM_DEV="/dev/ttySAC1"
+        ;;
 	"HTC Apache"|"HTC Blueangel"|"HTC Universal")
 		GSMD_OPTS="-s 115200 -F"
 		GSM_DEV="/dev/ttyS0"
diff --git a/packages/gsm/files/fic-gta02/.mtn2git_empty b/packages/gsm/files/fic-gta02/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gsm/files/fic-gta02/gsmd b/packages/gsm/files/fic-gta02/gsmd
new file mode 100644
index 0000000000..d8323e202c
--- /dev/null
+++ b/packages/gsm/files/fic-gta02/gsmd
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# gsmd  This shell script starts and stops gsmd.
+#
+# chkconfig: 345 90 40
+# description: Gsmd manages access to a serial- or USB-connected GSM
+# processname: gsmd
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+[ -f /etc/default/gsmd ] && . /etc/default/gsmd
+
+case "$1" in
+    start)
+        stty -F "$GSM_DEV" -crtscts
+        [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
+        stty -F "$GSM_DEV" -echo
+        [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
+        [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
+        [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
+
+        echo -n "Starting GSM daemon: "
+        start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
+
+        if [ $? = 0 ]; then
+            echo "gsmd."
+        else
+            echo "(failed.)"
+        fi
+        ;;
+    stop)
+        echo -n "Stopping GSM daemon: "
+        start-stop-daemon -K -x /usr/sbin/gsmd
+        stty -F "$GSM_DEV" -crtscts
+        [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
+        echo "gsmd."
+        ;;
+    restart|force-reload)
+        $0 stop
+        $0 start
+        ;;
+    *)
+        echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}"
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc
index c8167d648e..d14e1519dc 100644
--- a/packages/gsm/gsmd.inc
+++ b/packages/gsm/gsmd.inc
@@ -5,7 +5,6 @@ SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
 PV = "0.1+svnr${SRCREV}"
-PR = "r39"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
diff --git a/packages/gsm/libgsmd-devel_svn.bb b/packages/gsm/libgsmd-devel_svn.bb
index d584e88d38..9449c9b3ef 100644
--- a/packages/gsm/libgsmd-devel_svn.bb
+++ b/packages/gsm/libgsmd-devel_svn.bb
@@ -3,6 +3,8 @@ CONFLICTNAME = "gsmd"
 
 require gsmd.inc
 
+PR = "r40"
+
 PROVIDES += "libgsmd"
 RPROVIDES_${PN}-tools = "lib${CONFLICTNAME}-tools"
 
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index 9d3ca19c04..59301e8366 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -3,3 +3,5 @@ CONFLICTNAME = "gsmd-devel"
 
 require gsmd.inc
 
+PR = "r40"
+
-- 
cgit v1.2.3


From 661d86969203a5dfb3788e4cde3c43c56b84e071 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 13 Dec 2007 23:01:42 +0000
Subject: disapproval of revision '246f9c04a53439921ddf3390aeea277ba55bba13'

---
 packages/gsm/files/default                  |  8 +----
 packages/gsm/files/fic-gta02/.mtn2git_empty |  0
 packages/gsm/files/fic-gta02/gsmd           | 49 -----------------------------
 packages/gsm/gsmd.inc                       |  1 +
 packages/gsm/libgsmd-devel_svn.bb           |  2 --
 packages/gsm/libgsmd_svn.bb                 |  2 --
 6 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 packages/gsm/files/fic-gta02/.mtn2git_empty
 delete mode 100644 packages/gsm/files/fic-gta02/gsmd

diff --git a/packages/gsm/files/default b/packages/gsm/files/default
index d4014611d9..761100f702 100644
--- a/packages/gsm/files/default
+++ b/packages/gsm/files/default
@@ -3,18 +3,12 @@
 . /etc/init.d/functions
 
 case `cpuinfo_id` in
-	"GTA01")
+	"GTA01"|"GTA02")
 		GSMD_OPTS="-s 115200 -F"
 		GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
 		GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset"
 		GSM_DEV="/dev/ttySAC0"
 		;;
-    "GTA02")
-        GSMD_OPTS="-s 115200 -F"
-        GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
-        GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset"
-        GSM_DEV="/dev/ttySAC1"
-        ;;
 	"HTC Apache"|"HTC Blueangel"|"HTC Universal")
 		GSMD_OPTS="-s 115200 -F"
 		GSM_DEV="/dev/ttyS0"
diff --git a/packages/gsm/files/fic-gta02/.mtn2git_empty b/packages/gsm/files/fic-gta02/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/gsm/files/fic-gta02/gsmd b/packages/gsm/files/fic-gta02/gsmd
deleted file mode 100644
index d8323e202c..0000000000
--- a/packages/gsm/files/fic-gta02/gsmd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# gsmd  This shell script starts and stops gsmd.
-#
-# chkconfig: 345 90 40
-# description: Gsmd manages access to a serial- or USB-connected GSM
-# processname: gsmd
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-[ -f /etc/default/gsmd ] && . /etc/default/gsmd
-
-case "$1" in
-    start)
-        stty -F "$GSM_DEV" -crtscts
-        [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
-        stty -F "$GSM_DEV" -echo
-        [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
-        [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
-        [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
-
-        echo -n "Starting GSM daemon: "
-        start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
-
-        if [ $? = 0 ]; then
-            echo "gsmd."
-        else
-            echo "(failed.)"
-        fi
-        ;;
-    stop)
-        echo -n "Stopping GSM daemon: "
-        start-stop-daemon -K -x /usr/sbin/gsmd
-        stty -F "$GSM_DEV" -crtscts
-        [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
-        echo "gsmd."
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc
index d14e1519dc..c8167d648e 100644
--- a/packages/gsm/gsmd.inc
+++ b/packages/gsm/gsmd.inc
@@ -5,6 +5,7 @@ SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
 PV = "0.1+svnr${SRCREV}"
+PR = "r39"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
diff --git a/packages/gsm/libgsmd-devel_svn.bb b/packages/gsm/libgsmd-devel_svn.bb
index 9449c9b3ef..d584e88d38 100644
--- a/packages/gsm/libgsmd-devel_svn.bb
+++ b/packages/gsm/libgsmd-devel_svn.bb
@@ -3,8 +3,6 @@ CONFLICTNAME = "gsmd"
 
 require gsmd.inc
 
-PR = "r40"
-
 PROVIDES += "libgsmd"
 RPROVIDES_${PN}-tools = "lib${CONFLICTNAME}-tools"
 
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index 59301e8366..9d3ca19c04 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -3,5 +3,3 @@ CONFLICTNAME = "gsmd-devel"
 
 require gsmd.inc
 
-PR = "r40"
-
-- 
cgit v1.2.3


From 93ecb6b1ee315caafe63e3d0cac0174a05dea179 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 13 Dec 2007 23:02:32 +0000
Subject: uboot-openmoko svn remove glamo-ram-init.patch; has been applied
 upstream

---
 packages/uboot/files/glamo-ram-init.patch | 21 ---------------------
 packages/uboot/uboot-openmoko_svn.bb      |  3 +--
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 packages/uboot/files/glamo-ram-init.patch

diff --git a/packages/uboot/files/glamo-ram-init.patch b/packages/uboot/files/glamo-ram-init.patch
deleted file mode 100644
index 4c12074347..0000000000
--- a/packages/uboot/files/glamo-ram-init.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/board/neo1973/common/lowlevel_init.S b/board/neo1973/common/lowlevel_init.S
-index 582aa0e..92a9c7b 100644
---- a/board/neo1973/common/lowlevel_init.S
-+++ b/board/neo1973/common/lowlevel_init.S
-@@ -67,11 +67,11 @@
- #define B0_PMC		 	0x0	/* normal */
- 
- /* BANK1CON */
--#define B1_Tacs		 	0x0	/*  0clk */
--#define B1_Tcos		 	0x1	/*  1clk */
--#define B1_Tacc		 	0x4	/*  4clk */
--#define B1_Tcoh		 	0x1	/*  1clk */
--#define B1_Tah		 	0x0	/*  0clk */
-+#define B1_Tacs		 	0x3	/*  4clk */
-+#define B1_Tcos		 	0x3	/*  4clk */
-+#define B1_Tacc		 	0x7	/*  14clk */
-+#define B1_Tcoh		 	0x3	/*  4clk */
-+#define B1_Tah		 	0x3	/*  4clk */
- #define B1_Tacp		 	0x0
- #define B1_PMC		 	0x0
- 
diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb
index 36ec1e130e..2ce92ad4a9 100644
--- a/packages/uboot/uboot-openmoko_svn.bb
+++ b/packages/uboot/uboot-openmoko_svn.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 PROVIDES = "virtual/bootloader"
 LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}"
 PV = "1.3.0${LOCALVERSION}"
-PR = "r0"
+PR = "r1"
 
 SRCREV_FORMAT = "patches"
 
@@ -20,7 +20,6 @@ SRC_URI = "\
   file://uboot-eabi-fix-HACK.patch \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
   file://makefile-no-dirafter.patch;patch=1 \
-  file://glamo-ram-init.patch;patch=1 \
 "
 S = "${WORKDIR}/git"
 
-- 
cgit v1.2.3


From 8f3ca10fbd4d6634c7c8d25570e436847e777264 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 13 Dec 2007 23:10:20 +0000
Subject: python-pyqt 4.3.1 update to 4.3.3

---
 packages/python/python-pyqt_4.3.1.bb | 71 ------------------------------------
 packages/python/python-pyqt_4.3.3.bb | 71 ++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 71 deletions(-)
 delete mode 100644 packages/python/python-pyqt_4.3.1.bb
 create mode 100644 packages/python/python-pyqt_4.3.3.bb

diff --git a/packages/python/python-pyqt_4.3.1.bb b/packages/python/python-pyqt_4.3.1.bb
deleted file mode 100644
index d9c45ec14c..0000000000
--- a/packages/python/python-pyqt_4.3.1.bb
+++ /dev/null
@@ -1,71 +0,0 @@
-DESCRIPTION = "Python Qt4 Bindings"
-HOMEPAGE = "http://riverbankcomputing.co.uk"
-AUTHOR = "Phil Thomson @ riverbank.co.uk"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "GPL"
-RDEPENDS = "python-core"
-SRCNAME = "pyqt"
-PR = "ml0"
-
-SRC_URI = "\
-  http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \
-  file://cross-compile.patch;patch=1 \
-  file://01_configure.dpatch;patch=1 \
-  file://02_htmllinks.dpatch;patch=1 \
-  file://03_qreal.dpatch;patch=1 \
-  file://04_qreal_api_fixes.dpatch;patch=1"
-S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
-
-inherit qt4x11 sip distutils-base
-
-PARALLEL_MAKE = ""
-
-QMAKE_PROFILES = "pyqt.pro"
-EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
-EXTRA_OEMAKE = " MAKEFLAGS= "
-
-SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
-# SIP_MODULES += "QtAssistant"
-EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \
-                         INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
-                         DEFINES+=QT_NO_FPU"
-
-FIX_QREAL = "\
-  QtCore/qtimeline.sip \
-  QtCore/qrect.sip \
-  QtGui/qtransform.sip \
-"
-
-do_generate_prepend() {
-	for i in ${FIX_QREAL}; do
-		sed -i -e s,qreal,float,g sip/$i
-	done
-}
-
-do_configure_prepend() {
-    echo "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro
-}
-
-do_stage() {
-    install -d ${STAGING_SIPDIR}/qt/
-    install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages
-    for module in ${SIP_MODULES}
-    do
-        install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
-	install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so
-    done
-}
-
-do_install() {
-    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4
-    for module in ${SIP_MODULES}
-    do
-		echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py
-		install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so
-    done
-	cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
-	cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
-}
-
-FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages"
diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb
new file mode 100644
index 0000000000..d9c45ec14c
--- /dev/null
+++ b/packages/python/python-pyqt_4.3.3.bb
@@ -0,0 +1,71 @@
+DESCRIPTION = "Python Qt4 Bindings"
+HOMEPAGE = "http://riverbankcomputing.co.uk"
+AUTHOR = "Phil Thomson @ riverbank.co.uk"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "python-core"
+SRCNAME = "pyqt"
+PR = "ml0"
+
+SRC_URI = "\
+  http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \
+  file://cross-compile.patch;patch=1 \
+  file://01_configure.dpatch;patch=1 \
+  file://02_htmllinks.dpatch;patch=1 \
+  file://03_qreal.dpatch;patch=1 \
+  file://04_qreal_api_fixes.dpatch;patch=1"
+S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
+
+inherit qt4x11 sip distutils-base
+
+PARALLEL_MAKE = ""
+
+QMAKE_PROFILES = "pyqt.pro"
+EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
+EXTRA_OEMAKE = " MAKEFLAGS= "
+
+SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
+# SIP_MODULES += "QtAssistant"
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \
+                         INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
+                         DEFINES+=QT_NO_FPU"
+
+FIX_QREAL = "\
+  QtCore/qtimeline.sip \
+  QtCore/qrect.sip \
+  QtGui/qtransform.sip \
+"
+
+do_generate_prepend() {
+	for i in ${FIX_QREAL}; do
+		sed -i -e s,qreal,float,g sip/$i
+	done
+}
+
+do_configure_prepend() {
+    echo "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro
+}
+
+do_stage() {
+    install -d ${STAGING_SIPDIR}/qt/
+    install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages
+    for module in ${SIP_MODULES}
+    do
+        install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
+	install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so
+    done
+}
+
+do_install() {
+    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4
+    for module in ${SIP_MODULES}
+    do
+		echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py
+		install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so
+    done
+	cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
+	cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
+}
+
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages"
-- 
cgit v1.2.3


From d090606e4961c3d1efcaec58cb1d162eb7b5b4a1 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 13 Dec 2007 23:12:08 +0000
Subject: python-pyqt 4.3.3 change sip tag

---
 packages/python/python-pyqt_4.3.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb
index d9c45ec14c..2d30922408 100644
--- a/packages/python/python-pyqt_4.3.3.bb
+++ b/packages/python/python-pyqt_4.3.3.bb
@@ -22,7 +22,7 @@ inherit qt4x11 sip distutils-base
 PARALLEL_MAKE = ""
 
 QMAKE_PROFILES = "pyqt.pro"
-EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
+EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_3 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
 SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
-- 
cgit v1.2.3


From b89fec52bff373fb1efd7f6b24b52b282770d03e Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 14 Dec 2007 00:09:22 +0000
Subject: pointercal 0.0 add file for e680

---
 packages/pointercal/files/e680/.mtn2git_empty | 0
 packages/pointercal/files/e680/pointercal     | 1 +
 packages/pointercal/pointercal_0.0.bb         | 2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 packages/pointercal/files/e680/.mtn2git_empty
 create mode 100644 packages/pointercal/files/e680/pointercal

diff --git a/packages/pointercal/files/e680/.mtn2git_empty b/packages/pointercal/files/e680/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/pointercal/files/e680/pointercal b/packages/pointercal/files/e680/pointercal
new file mode 100644
index 0000000000..8b0651dd21
--- /dev/null
+++ b/packages/pointercal/files/e680/pointercal
@@ -0,0 +1 @@
+-19857 -412 18085522 189 -23922 22734294 65536
diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb
index 4fa8c1cc0e..e79ee0b889 100644
--- a/packages/pointercal/pointercal_0.0.bb
+++ b/packages/pointercal/pointercal_0.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Touchscreen calibration data"
 SECTION = "base"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "file://pointercal"
 S = "${WORKDIR}"
-- 
cgit v1.2.3


From 299011d1da4cb08ac521ff94bce8377110019ebc Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 14 Dec 2007 00:14:22 +0000
Subject: matchbox-keyboard-inputmethod svn catch up fic-gta01-font-size patch
 and also apply for gta02

---
 packages/matchbox-keyboard/files/fic-gta01-font-size.patch      | 8 ++++----
 packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch
index 3a09ac5bc2..c25aa74ca4 100644
--- a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch
+++ b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch
@@ -1,12 +1,12 @@
 Index: matchbox-keyboard/src/matchbox-keyboard.c
 ===================================================================
---- matchbox-keyboard.orig/src/matchbox-keyboard.c	2007-08-19 17:26:59.000000000 +0200
-+++ matchbox-keyboard/src/matchbox-keyboard.c	2007-08-19 17:27:06.000000000 +0200
-@@ -52,7 +52,7 @@
+--- matchbox-keyboard.orig/src/matchbox-keyboard.c
++++ matchbox-keyboard/src/matchbox-keyboard.c
+@@ -54,7 +54,7 @@
    kb->row_spacing = 5;
  
    kb->font_family  = strdup("sans");
--  kb->font_pt_size = 5;
+-  kb->font_pt_size = 6;
 +  kb->font_pt_size = 3;
    kb->font_variant = strdup("bold");
  
diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
index 2b84a19bd7..4384b6db7d 100644
--- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
+++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
@@ -3,21 +3,21 @@ LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
 RCONFLICTS_${PN} = "matchbox-keyboard"
 RPROVIDES_${PN} = "matchbox-keyboard"
-#DEFAULT_PREFERENCE = "-1"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
-	file://smallscreen-fontsize.patch;patch=1 \
+	    file://smallscreen-fontsize.patch;patch=1 \
         file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
         file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
         file://4-Add-rendering-debug-logging.patch;patch=1 \
         file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \
         file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \
-	file://80matchboxkeyboard"
+	    file://80matchboxkeyboard"
 
 SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1"
+SRC_URI_append_fic-gta02 = " file://fic-gta01-font-size.patch;patch=1"
 
 S = "${WORKDIR}/matchbox-keyboard"
 
-- 
cgit v1.2.3


From 01b315d005188bca40f6713d485234ce97c65b7b Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 14 Dec 2007 00:19:36 +0000
Subject: sip.bbclass: =+ emits problems with task dependencies, using += now

---
 classes/sip.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/sip.bbclass b/classes/sip.bbclass
index 6f77f460dc..ae186bd04a 100644
--- a/classes/sip.bbclass
+++ b/classes/sip.bbclass
@@ -4,7 +4,7 @@
 
 # yes, python-sip is actually a build-time dependency, since
 # the recipe installs sip.h
-DEPENDS =+ "sip-native python-sip"
+DEPENDS += "sip-native python-sip"
 
 # default stuff, do not uncomment
 # EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
-- 
cgit v1.2.3


From 0a080ee0fd673cc529dda6e9f464de6b011e58ca Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 14 Dec 2007 00:47:44 +0000
Subject: python-pyqt 4.3.3 set sip tag back to 4.3.2 until we actually have Qt
 4.3.3 in OE

---
 packages/python/python-pyqt_4.3.3.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb
index 2d30922408..74a16c4720 100644
--- a/packages/python/python-pyqt_4.3.3.bb
+++ b/packages/python/python-pyqt_4.3.3.bb
@@ -22,7 +22,8 @@ inherit qt4x11 sip distutils-base
 PARALLEL_MAKE = ""
 
 QMAKE_PROFILES = "pyqt.pro"
-EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_3 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
+# NOTE: match with qt version we have in OE
+EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
 SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
-- 
cgit v1.2.3


From 8e148d8850646c085f55247d06eb1c5a09a56e85 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Fri, 14 Dec 2007 14:12:02 +0000
Subject: opie-citytime: replace recommendation for timezones with tzdata

---
 packages/opie-citytime/opie-citytime.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/opie-citytime/opie-citytime.inc b/packages/opie-citytime/opie-citytime.inc
index a2fe0972af..529eba0d7f 100644
--- a/packages/opie-citytime/opie-citytime.inc
+++ b/packages/opie-citytime/opie-citytime.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "Opie Time-zone / world clock settings"
 SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
-RRECOMMENDS = "timezones"
+RRECOMMENDS = "tzdata"
+PR = "r1"
 
 APPNAME = "citytime"
 
-- 
cgit v1.2.3


From 84ef044e8283ba93d955f443b17d41d0ba164644 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 14 Dec 2007 15:55:53 +0000
Subject: devimage 0.1: Add DESCRIPTION.

---
 packages/initrdscripts/devimage_0.1.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/initrdscripts/devimage_0.1.bb b/packages/initrdscripts/devimage_0.1.bb
index 8eb6fa2d83..08949b9515 100644
--- a/packages/initrdscripts/devimage_0.1.bb
+++ b/packages/initrdscripts/devimage_0.1.bb
@@ -1,5 +1,6 @@
+DESCRIPTION = "Set of files to initialize bare system suitable for kernel, etc. testing."
 SRC_URI = "file://devimage.sh file://passwd file://dropbear_rsa_host_key"
-PR = "r1"
+PR = "r2"
 
 do_install() {
         install -m 0755 ${WORKDIR}/devimage.sh ${D}/init
-- 
cgit v1.2.3


From 64402b881bef4b626bff9543c9dbc50c1bc7e524 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 14 Dec 2007 16:07:03 +0000
Subject: task-devimage: Add kexec-tools.

---
 packages/tasks/task-devimage.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/tasks/task-devimage.bb b/packages/tasks/task-devimage.bb
index bd0c15e70f..9da765ee94 100644
--- a/packages/tasks/task-devimage.bb
+++ b/packages/tasks/task-devimage.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Image for development testing"
-PR = "r1"
+PR = "r2"
 LICENSE = "MIT"
 
 inherit task
@@ -14,6 +14,7 @@ RDEPENDS = "\
     module-init-tools pcmciautils \
     wireless-tools wpa-supplicant \
     irda-utils acx-firmware \
+    kexec-tools \
     ${DEVIMAGE_EXTRA_RDEPENDS} \
     "
 
-- 
cgit v1.2.3


From 90d0fadc3148a28f3f79b95f084f4cf6f0390d24 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Fri, 14 Dec 2007 18:46:04 +0000
Subject: spandsp: fix SRC_URI * reorder some fields according to policy *
 do_qa_configure still errors out ("host includes"). package remains broken.

---
 packages/spandsp/spandsp_0.0.3.bb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/spandsp/spandsp_0.0.3.bb b/packages/spandsp/spandsp_0.0.3.bb
index 26702f998b..97a1428398 100644
--- a/packages/spandsp/spandsp_0.0.3.bb
+++ b/packages/spandsp/spandsp_0.0.3.bb
@@ -1,13 +1,11 @@
 DESCRIPTION = "A library of many DSP functions for telephony."
 HOMEPAGE = "http://www.soft-switch.org"
-DEPENDS = "tiff libxml2"
 SECTION = "voip"
 LICENSE = "GPL"
-PV = "0.0.3"
-PSUBV = "pre27"
-PR = "r0"
+DEPENDS = "tiff libxml2"
+PR = "r1"
 
-SRC_URI = "http://www.soft-switch.org/downloads/snapshots/spandsp/spandsp-20070123.tar.gz"
+SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-${PV}.tgz"
 
 inherit autotools
 
-- 
cgit v1.2.3


From b3f0aa20d4e63ee1af3f6ba7e3691b8e7de19ad8 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 15 Dec 2007 05:03:01 +0000
Subject: package.bbclass: Add ASSUME_SHLIBS, way to specify shlib dependencies
 for ASSUME_PROVIDED. * List of <shlib_file_name>:<package>[_<version>]
 mappings. This info will be appended to one inferred by automatic shlib
 tracking code. So, it would be possible to have correct package dependencies
 even for libraries in ASSUME_PROVIDED.

---
 classes/package.bbclass | 10 ++++++++++
 conf/documentation.conf |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 67aeb33a13..37b9d83d97 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -694,6 +694,16 @@ python package_do_shlibs() {
 				for l in lines:
 					shlib_provider[l.rstrip()] = (dep_pkg, lib_ver)
 
+	assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, 1)
+	if assumed_libs:
+	    for e in assumed_libs.split():
+		l, dep_pkg = e.split(":")
+		lib_ver = None
+		dep_pkg = dep_pkg.rsplit("_", 1)
+		if len(dep_pkg) == 2:
+		    lib_ver = dep_pkg[1]
+		dep_pkg = dep_pkg[0]
+		shlib_provider[l] = (dep_pkg, lib_ver)
 
 	for pkg in packages.split():
 		bb.debug(2, "calculating shlib requirements for %s" % pkg)
diff --git a/conf/documentation.conf b/conf/documentation.conf
index 44a174a01b..96a292b9d7 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -34,6 +34,11 @@ TARGET_CC_ARCH[doc] = "FIXME"
 TARGET_FPU[doc] = "Floating point option (mostly for FPU-less systems), can be 'soft' or empty \
 for hardware floating point instructions."
 
+ASSUME_PROVIDED[doc] = "List of packages (recipes actually) which are assumed to be implicitly available.\
+ These packages won't be built by bitbake."
+ASSUME_SHLIBS[doc] = "List of shlib:package[_version] mappings. Useful for lib packages in ASSUME_PROVIDED,\
+ for which automatic shlib dependency tracking doesn't work."
+
 PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If you have \
 machine dependant configuration options in your bitbake file add a \
 PACKAGE_ARCH  = "${MACHINE_ARCH}" to the file.'
-- 
cgit v1.2.3


From c415ee0b42783845087f27f2c8c003ca34d65ca5 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 15 Dec 2007 05:25:44 +0000
Subject: sanity.bbclass: Requiring MACHINE to be set is too paranoid. * It's
 pretty legal to have only TARGET_ARCH set, for example to build
 non-machine-specific packages (for example, using external SDK).

---
 classes/sanity.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 479abce7fa..cc413b7011 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -70,8 +70,9 @@ def check_sanity(e):
 	if "diffstat-native" not in assume_provided:
 		messages = messages + 'Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n'
 	
-	# Check that the MACHINE is valid
-	if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
+	# Check that the MACHINE is valid, if it is set
+	if data.getVar('MACHINE', e.data, True):
+	    if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
 		messages = messages + 'Please set a valid MACHINE in your local.conf\n'
 	
 	# Check that the DISTRO is valid
-- 
cgit v1.2.3


From 95ed174327e665abc2c1c0be20cb19f032b12421 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 15 Dec 2007 08:39:06 +0000
Subject: angstrom: bump to RC1

---
 conf/distro/angstrom-2007.1.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 2860f55854..954f4b5e9c 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -6,9 +6,9 @@
 #@MAINTAINER: Michael 'Mickey' Lau