From bedcce6f3effef4a76b09fe33b927c5d867911f7 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 29 Aug 2007 17:09:23 +0000
Subject: qte-mt-static: Set DEFAULT_PREF=-1, this is hightly adhoc target. *
 To help a bit people who try to build OPIE w/o reading instructions.

---
 packages/qte/qte-mt-static_2.3.10.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb
index 21feb25fef..c7d962343a 100644
--- a/packages/qte/qte-mt-static_2.3.10.bb
+++ b/packages/qte/qte-mt-static_2.3.10.bb
@@ -1,6 +1,8 @@
 require qte-common_${PV}.inc
 PR = "r8"
 
+DEFAULT_PREFERENCE = "-1"
+
 EXTRA_OECONF += "-static -thread"
 
 do_stage() {
-- 
cgit v1.2.3


From 923efe9a7617d49e96ea4ec1b3658b7a81a7bcf0 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 2 Sep 2007 21:49:57 +0000
Subject: official ezx name for the ROKR E2 is rokre2 (yes it looks ugly... ;)

---
 conf/machine/rokr-e2.conf       |  9 ---------
 conf/machine/rokre2.conf        |  8 ++++++++
 packages/tasks/task-openmoko.bb | 14 +++++++-------
 3 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 100644 conf/machine/rokr-e2.conf
 create mode 100644 conf/machine/rokre2.conf

diff --git a/conf/machine/rokr-e2.conf b/conf/machine/rokr-e2.conf
deleted file mode 100644
index ccd496c03d..0000000000
--- a/conf/machine/rokr-e2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: Motorola EZX rokr e2 
-#@DESCRIPTION: Machine configuration for the Motorola GSM phones rokr e2
-
-require conf/machine/include/motorola-ezx-base.inc
-
-#no touchscreen
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-
diff --git a/conf/machine/rokre2.conf b/conf/machine/rokre2.conf
new file mode 100644
index 0000000000..621e95f166
--- /dev/null
+++ b/conf/machine/rokre2.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: Motorola EZX ROKR E2
+#@DESCRIPTION: Machine configuration for the Motorola GSM Phone ROKR E2
+
+require conf/machine/include/motorola-ezx-base.inc
+
+# there is no touchscreen
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index f28589b6b7..0ddf590c9d 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -77,13 +77,13 @@ RDEPENDS_task-openmoko-ui = "\
 # handle theming. FIXME: properly use machine database in a smart way,
 # taking into account not only size but also PPI! Ultimately this might
 # need recomputing some theme files and images on-the-fly :/ SVG and logical
-# theme description anyone?
-THEMES       = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
-THEMES_a780  = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_e680  = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_a1200 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_rokr2 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_rokr6 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+# theme description anyone? Or simply Edje to the rescue! :D
+THEMES        = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
+THEMES_a780   = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_e680   = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_a1200  = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_rokre2 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_rokre6 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
 
 RDEPENDS_task-openmoko-ui += "${THEMES}"
 
-- 
cgit v1.2.3


From 87831ee784b33096096766ee3c1e431fffd8119b Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 3 Sep 2007 11:10:24 +0000
Subject: openmoko-mediaplayer2: add dependency on gst-meta-audio

---
 packages/openmoko2/openmoko-mediaplayer2_svn.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
index 871416c066..e353bcbaa7 100644
--- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb
+++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "A media player for OpenMoko"
 SECTION = "openmoko/tools"
 DEPENDS = "libmokoui2 expat gstreamer libspiff"
+RDEPENDS = "gst-meta-audio"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2
 
 FILES_${PN} += "${datadir}/openmoko-mediaplayer"
-
-- 
cgit v1.2.3


From 7217b0c316ec2caacf1d1d7d8eeb539f86dc16e0 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Mon, 3 Sep 2007 12:22:20 +0000
Subject: classes/{qmake*,qt4x11}.bbclass: Add a qmake2.bbclass to use qmake
 version two     Add a qmake2.bbclass which currently takes over the role of
 qt4x11.bbclass     with setting the QTDIR, MOC, UIC properly. qmake2 and
 qmake now share     qmake-base.bbclass this is why some var assignments and
 functions have     been moved around.     Make webkit-gtk use qmake2 to
 eliminate the Qt3 and Qt4/X11 dependency.

---
 classes/qmake-base.bbclass        | 66 ++++++++++++++++++++++++++++++++-------
 classes/qmake.bbclass             | 65 +++++++-------------------------------
 classes/qmake2.bbclass            | 20 ++++++++++++
 classes/qt4x11.bbclass            | 19 ++---------
 packages/webkit/webkit-gtk_svn.bb |  6 ++--
 5 files changed, 91 insertions(+), 85 deletions(-)
 create mode 100644 classes/qmake2.bbclass

diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass
index b623b34aaa..52f6d830a0 100644
--- a/classes/qmake-base.bbclass
+++ b/classes/qmake-base.bbclass
@@ -1,4 +1,3 @@
-DEPENDS_prepend = "qmake-native "
 
 OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++"
 QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"
@@ -9,22 +8,12 @@ EXTRA_OEMAKE = ' MAKEFLAGS= '
 export OE_QMAKE_CC="${CC}"
 export OE_QMAKE_CFLAGS="${CFLAGS}"
 export OE_QMAKE_CXX="${CXX}"
-export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
 export OE_QMAKE_LDFLAGS="${LDFLAGS}"
-export OE_QMAKE_LINK="${CCLD}"
 export OE_QMAKE_AR="${AR}"
 export OE_QMAKE_STRIP="echo"
-export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
-export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
-export OE_QMAKE_RCC="non-existant"
-export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
 export OE_QMAKE_RPATH="-Wl,-rpath-link,"
 
 # default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11
-export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
-export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
-export OE_QMAKE_LIBS_QT="qte"
-export OE_QMAKE_LIBS_X11=""
 
 oe_qmake_mkspecs () {
     mkdir -p mkspecs/${OE_QMAKE_PLATFORM}
@@ -42,3 +31,58 @@ oe_qmake_mkspecs () {
     done
 }
 
+qmake-base_do_configure() {
+	case ${QMAKESPEC} in
+	*linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++)
+		;;
+	*-oe-g++)
+		die Unsupported target ${TARGET_OS} for oe-g++ qmake spec
+		;;
+	*)
+		oenote Searching for qmake spec file
+		paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++"
+		paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths"
+
+		if (echo "${TARGET_ARCH}"|grep -q 'i.86'); then
+			paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-x86-g++ $paths"
+		fi
+		for i in $paths; do
+			if test -e $i; then
+				export QMAKESPEC=$i
+				break
+			fi
+		done
+		;;
+	esac
+
+	oenote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'"
+
+	if [ -z "${QMAKE_PROFILES}" ]; then 
+		PROFILES="`ls *.pro`"
+	else
+		PROFILES="${QMAKE_PROFILES}"
+	fi
+
+	if [ -z "$PROFILES" ]; then
+		die "QMAKE_PROFILES not set and no profiles found in $PWD"
+        fi
+
+	if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then
+		AFTER="-after"
+		QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}"
+		oenote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}"
+	fi
+
+	if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then
+		QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}"
+		oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}"
+	fi
+
+#oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'"
+	unset QMAKESPEC || true
+	${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES"
+}
+
+EXPORT_FUNCTIONS do_configure
+
+addtask configure after do_unpack do_patch before do_compile
diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass
index 4f2fceff35..b45e54ca6a 100644
--- a/classes/qmake.bbclass
+++ b/classes/qmake.bbclass
@@ -1,57 +1,14 @@
 inherit qmake-base
 
-qmake_do_configure() {
-	case ${QMAKESPEC} in
-	*linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++)
-		;;
-	*-oe-g++)
-		die Unsupported target ${TARGET_OS} for oe-g++ qmake spec
-		;;
-	*)
-		oenote Searching for qmake spec file
-		paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++"
-		paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths"
+DEPENDS_prepend = "qmake-native "
+
+export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
+export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
+export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
+export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
+export OE_QMAKE_LINK="${CCLD}"
+export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
+export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
+export OE_QMAKE_LIBS_QT="qte"
+export OE_QMAKE_LIBS_X11=""
 
-		if (echo "${TARGET_ARCH}"|grep -q 'i.86'); then
-			paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-x86-g++ $paths"
-		fi
-		for i in $paths; do
-			if test -e $i; then
-				export QMAKESPEC=$i
-				break
-			fi
-		done
-		;;
-	esac
-
-	oenote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'"
-
-	if [ -z "${QMAKE_PROFILES}" ]; then 
-		PROFILES="`ls *.pro`"
-	else
-		PROFILES="${QMAKE_PROFILES}"
-	fi
-
-	if [ -z "$PROFILES" ]; then
-		die "QMAKE_PROFILES not set and no profiles found in $PWD"
-        fi
-
-	if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then
-		AFTER="-after"
-		QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}"
-		oenote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}"
-	fi
-
-	if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then
-		QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}"
-		oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}"
-	fi
-
-#oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'"
-	unset QMAKESPEC || true
-	${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES"
-}
-
-EXPORT_FUNCTIONS do_configure
-
-addtask configure after do_unpack do_patch before do_compile
diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass
new file mode 100644
index 0000000000..86f1439b30
--- /dev/null
+++ b/classes/qmake2.bbclass
@@ -0,0 +1,20 @@
+#
+# QMake variables for Qt4
+#
+inherit qmake-base
+
+DEPENDS_prepend = "qmake2-native uicmoc4-native "
+
+export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
+export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
+export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
+export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
+export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
+export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
+export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
+export OE_QMAKE_LINK = "${CXX}"
+export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
+export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
+export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
+export OE_QMAKE_LIBS_QT = "qt"
+export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index 7046ef1cb9..76a45c33cb 100644
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -1,18 +1,3 @@
-DEPENDS_prepend = "qmake2-native "
 DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-free')]}"
-#
-# override variables set by qmake-base to compile Qt4/X11 apps
-#
-export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
-export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
-export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
-export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
-export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
-export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
-export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
-export OE_QMAKE_LINK = "${CXX}"
-export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
-export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
-export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
-export OE_QMAKE_LIBS_QT = "qt"
-export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
+
+inherit qmake2
diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb
index 8a6480d54f..112c45c1e3 100644
--- a/packages/webkit/webkit-gtk_svn.bb
+++ b/packages/webkit/webkit-gtk_svn.bb
@@ -1,10 +1,10 @@
-DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
+DEPENDS = "flex-native gperf-native gperf perl-native curl icu libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
 
 # Yes, this is wrong...
 PV = "0.0+svn${SRCDATE}"
 PR = "r1"
 
-inherit qmake qt4x11 pkgconfig
+inherit qmake2 pkgconfig
 
 SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
@@ -21,7 +21,7 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/"
 
-do_configure_append() {
+do_configure() {
 	qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
 	mkdir -p WebKitBuilds/Debug
 	cd WebKitBuilds/Debug
-- 
cgit v1.2.3


From 091e7119a47782b211bef02523e651385d711620 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 3 Sep 2007 13:10:20 +0000
Subject: xournal_0.4.bb : version upgrade

---
 packages/xournal/xournal_0.4.bb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 packages/xournal/xournal_0.4.bb

diff --git a/packages/xournal/xournal_0.4.bb b/packages/xournal/xournal_0.4.bb
new file mode 100644
index 0000000000..5a8a1b74b7
--- /dev/null
+++ b/packages/xournal/xournal_0.4.bb
@@ -0,0 +1,17 @@
+HOMEPAGE = "http://xournal.sf.net/"
+DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus."
+DEPENDS = "gtk+ libgnomecanvas libgnomeprintui"
+SECTION = "x11"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://xournal.sourceforge.net/xournal-${PV}.tar.gz \
+           file://xournal.desktop"
+
+inherit autotools pkgconfig
+
+do_install_append () {
+	install -d ${D}${datadir}/applications/
+	install -m 0644 ${WORKDIR}/xournal.desktop ${D}${datadir}/applications/
+}
+
-- 
cgit v1.2.3


From f99e73c4e06910002979b0df3336d4b1941444bf Mon Sep 17 00:00:00 2001
From: Simon Vogl <vogl@soft.uni-linz.ac.at>
Date: Mon, 3 Sep 2007 13:34:06 +0000
Subject: pxaregs: added 1.14 - close #2915

---
 packages/pxaregs/.mtn2git_empty              |  0
 packages/pxaregs/pxaregs-1.14/.mtn2git_empty |  0
 packages/pxaregs/pxaregs-1.14/Makefile       |  3 +++
 packages/pxaregs/pxaregs-1.14/i2c.patch      | 15 +++++++++++++++
 packages/pxaregs/pxaregs-1.14/munmap.patch   | 22 ++++++++++++++++++++++
 packages/pxaregs/pxaregs-1.14/serial.patch   | 14 ++++++++++++++
 packages/pxaregs/pxaregs-1.14/usb.patch      | 17 +++++++++++++++++
 packages/pxaregs/pxaregs_1.14.bb             | 21 +++++++++++++++++++++
 8 files changed, 92 insertions(+)
 create mode 100644 packages/pxaregs/.mtn2git_empty
 create mode 100644 packages/pxaregs/pxaregs-1.14/.mtn2git_empty
 create mode 100644 packages/pxaregs/pxaregs-1.14/Makefile
 create mode 100644 packages/pxaregs/pxaregs-1.14/i2c.patch
 create mode 100644 packages/pxaregs/pxaregs-1.14/munmap.patch
 create mode 100644 packages/pxaregs/pxaregs-1.14/serial.patch
 create mode 100644 packages/pxaregs/pxaregs-1.14/usb.patch
 create mode 100644 packages/pxaregs/pxaregs_1.14.bb

diff --git a/packages/pxaregs/.mtn2git_empty b/packages/pxaregs/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/pxaregs/pxaregs-1.14/.mtn2git_empty b/packages/pxaregs/pxaregs-1.14/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/pxaregs/pxaregs-1.14/Makefile b/packages/pxaregs/pxaregs-1.14/Makefile
new file mode 100644
index 0000000000..00b7d52624
--- /dev/null
+++ b/packages/pxaregs/pxaregs-1.14/Makefile
@@ -0,0 +1,3 @@
+
+
+all: pxaregs
diff --git a/packages/pxaregs/pxaregs-1.14/i2c.patch b/packages/pxaregs/pxaregs-1.14/i2c.patch
new file mode 100644
index 0000000000..36983ec479
--- /dev/null
+++ b/packages/pxaregs/pxaregs-1.14/i2c.patch
@@ -0,0 +1,15 @@
+Index: pxaregs-1.14/pxaregs.c
+===================================================================
+--- pxaregs-1.14.orig/pxaregs.c
++++ pxaregs-1.14/pxaregs.c
+@@ -21,10 +21,6 @@
+ #include <fcntl.h>
+ #include <ctype.h>
+ 
+-#include <linux/i2c.h>
+-#include <linux/i2c-dev.h>
+-
+-
+ // fd for /dev/mem
+ static int fd = -1;
+ 
diff --git a/packages/pxaregs/pxaregs-1.14/munmap.patch b/packages/pxaregs/pxaregs-1.14/munmap.patch
new file mode 100644
index 0000000000..a9c4b95cf0
--- /dev/null
+++ b/packages/pxaregs/pxaregs-1.14/munmap.patch
@@ -0,0 +1,22 @@
+Index: pxaregs-1.14/pxaregs.c
+===================================================================
+--- pxaregs-1.14.orig/pxaregs.c
++++ pxaregs-1.14/pxaregs.c
+@@ -1794,7 +1794,7 @@ static int getmem(u32 addr)
+    regaddr = map + (addr & MAP_MASK);
+ 
+    val = *(u32*) regaddr;
+-   munmap(0,MAP_SIZE);
++   munmap(map,MAP_SIZE);
+ 
+    return val;
+ }
+@@ -1829,7 +1829,7 @@ static void putmem(u32 addr, u32 val)
+    regaddr = map + (addr & MAP_MASK);
+ 
+    *(u32*) regaddr = val;
+-   munmap(0,MAP_SIZE);
++   munmap(map,MAP_SIZE);
+ }
+ 
+ static u32 lastaddr = 0;
diff --git a/packages/pxaregs/pxaregs-1.14/serial.patch b/packages/pxaregs/pxaregs-1.14/serial.patch
new file mode 100644
index 0000000000..06853851d0
--- /dev/null
+++ b/packages/pxaregs/pxaregs-1.14/serial.patch
@@ -0,0 +1,14 @@
+Index: pxaregs-1.14/pxaregs.c
+===================================================================
+--- pxaregs-1.14.orig/pxaregs.c
++++ pxaregs-1.14/pxaregs.c
+@@ -78,6 +78,9 @@ static struct reg_info regs[] = {
+ { "ISAR",      0x403016A0,  0, 0xffffffff, 'x', "I2C Slave Address Register" },
+ { "ISAR_SA",   0x403016A0,  0, 0x0000007f, 'x', "I2C Slave Address" },
+ 
++{ "HW_MCR",    0x41600010,  0, 0xffffffff, 'x', "HWUART Modem Control Register" },
++{ "HW_MSR",    0x41600018,  0, 0xffffffff, 'x', "HWUART Modem Status Register" },
++
+ { "PMCR",      0x40F00000,  0, 0xffffffff, 'x', "Power Manager Control Register (3-23)" },
+ { "PMCR_IDAE", 0x40F00000,  0, 0x00000001, 'd', "PM imprecise data abort abort signal" },
+ 
diff --git a/packages/pxaregs/pxaregs-1.14/usb.patch b/packages/pxaregs/pxaregs-1.14/usb.patch
new file mode 100644
index 0000000000..59f21fe3c1
--- /dev/null
+++ b/packages/pxaregs/pxaregs-1.14/usb.patch
@@ -0,0 +1,17 @@
+Index: pxaregs-1.14/pxaregs.c
+===================================================================
+--- pxaregs-1.14.orig/pxaregs.c
++++ pxaregs-1.14/pxaregs.c
+@@ -78,6 +78,12 @@ static struct reg_info regs[] = {
+ { "ISAR",      0x403016A0,  0, 0xffffffff, 'x', "I2C Slave Address Register" },
+ { "ISAR_SA",   0x403016A0,  0, 0x0000007f, 'x', "I2C Slave Address" },
+ 
++{ "UP2OCR",    0x40600020,  0, 0xffffffff, 'x', "USB Port 2 Output Control Register" },
++{ "UP2OCR_SEOS", 0x40600020, 24, 7, 'x', "USB Port 2 Single-Ended Output Select" },
++{ "UP2OCR_HXOE", 0x40600020, 17, 1, 'x', "USB Port 2 Tranceiver OE" },
++{ "UP2OCR_HXS",  0x40600020, 16, 1, 'x', "USB Port 2 Tranceiver Output Select" },
++{ "UP2OCR_IDON", 0x40600020, 10, 1, 'x', "OTG ID Read Enable" },
++
+ { "HW_MCR",    0x41600010,  0, 0xffffffff, 'x', "HWUART Modem Control Register" },
+ { "HW_MSR",    0x41600018,  0, 0xffffffff, 'x', "HWUART Modem Status Register" },
+ 
diff --git a/packages/pxaregs/pxaregs_1.14.bb b/packages/pxaregs/pxaregs_1.14.bb
new file mode 100644
index 0000000000..d57dacef51
--- /dev/null
+++ b/packages/pxaregs/pxaregs_1.14.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Tool to display and modify PXA registers at runtime"
+LICENSE = "GPLv2"
+AUTHOR = "Holger Schurig <hs4233@mail.mn-solutions.de>"
+HOMEPAGE = "http://www.mn-logistik.de/unsupported/pxa250/"
+
+SRC_URI = "http://www.mn-logistik.de/unsupported/pxa250/pxaregs.c \
+           file://i2c.patch;pnum=1;patch=1 \
+           file://munmap.patch;pnum=1;patch=1 \
+           file://serial.patch;pnum=1;patch=1 \
+           file://usb.patch;pnum=1;patch=1 "
+
+S = "${WORKDIR}"
+
+do_compile() {
+    ${CC} pxaregs.c -o pxaregs ${CFLAGS}
+}
+
+do_install() {
+	install -d ${D}${sbindir}/
+	install -m 0755 pxaregs ${D}${sbindir}/
+}
-- 
cgit v1.2.3


From 8ba324c9581d435fd728cddda6a5f59740bd3dac Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 3 Sep 2007 14:03:38 +0000
Subject: binutils: added 2.18 from Poky (normal, cross, sdk)

---
 packages/binutils/binutils-2.18/.mtn2git_empty     |  0
 .../binutils/binutils-2.18/110-arm-eabi-conf.patch | 24 +++++++++++
 ...tils-2.16.91.0.6-objcopy-rename-errorcode.patch | 39 +++++++++++++++++
 .../binutils-uclibc-100-uclibc-conf.patch          | 34 +++++++++++++++
 ...binutils-uclibc-300-001_ld_makefile_patch.patch | 50 ++++++++++++++++++++++
 ...binutils-uclibc-300-006_better_file_error.patch | 43 +++++++++++++++++++
 ...ils-uclibc-300-012_check_ldrunpath_length.patch | 47 ++++++++++++++++++++
 packages/binutils/binutils-cross-sdk_2.18.bb       | 21 +++++++++
 packages/binutils/binutils-cross_2.18.bb           |  3 ++
 packages/binutils/binutils_2.18.bb                 | 11 +++++
 10 files changed, 272 insertions(+)
 create mode 100644 packages/binutils/binutils-2.18/.mtn2git_empty
 create mode 100644 packages/binutils/binutils-2.18/110-arm-eabi-conf.patch
 create mode 100644 packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch
 create mode 100644 packages/binutils/binutils-2.18/binutils-uclibc-100-uclibc-conf.patch
 create mode 100644 packages/binutils/binutils-2.18/binutils-uclibc-300-001_ld_makefile_patch.patch
 create mode 100644 packages/binutils/binutils-2.18/binutils-uclibc-300-006_better_file_error.patch
 create mode 100644 packages/binutils/binutils-2.18/binutils-uclibc-300-012_check_ldrunpath_length.patch
 create mode 100644 packages/binutils/binutils-cross-sdk_2.18.bb
 create mode 100644 packages/binutils/binutils-cross_2.18.bb
 create mode 100644 packages/binutils/binutils_2.18.bb

diff --git a/packages/binutils/binutils-2.18/.mtn2git_empty b/packages/binutils/binutils-2.18/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/binutils/binutils-2.18/110-arm-eabi-conf.patch b/packages/binutils/binutils-2.18/110-arm-eabi-conf.patch
new file mode 100644
index 0000000000..050969bf64
--- /dev/null
+++ b/packages/binutils/binutils-2.18/110-arm-eabi-conf.patch
@@ -0,0 +1,24 @@
+diff -urN binutils-2.16.91.0.7.orig/configure binutils-2.16.91.0.7/configure
+--- binutils-2.16.91.0.7.orig/configure	2006-05-31 14:54:24.000000000 +0300
++++ binutils-2.16.91.0.7/configure	2006-05-31 14:55:53.000000000 +0300
+@@ -1299,7 +1299,7 @@
+   arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
+     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+     ;;
+-  arm*-*-linux-gnueabi)
++  arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
+     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+     noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+     ;;
+diff -urN binutils-2.16.91.0.7.orig/configure.in binutils-2.16.91.0.7/configure.in
+--- binutils-2.16.91.0.7.orig/configure.ac	2006-05-31 14:54:24.000000000 +0300
++++ binutils-2.16.91.0.7/configure.ac	2006-05-31 14:55:53.000000000 +0300
+@@ -497,7 +497,7 @@
+   arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
+     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+     ;;
+-  arm*-*-linux-gnueabi)
++  arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
+     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+     noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+     ;;
diff --git a/packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch b/packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch
new file mode 100644
index 0000000000..8df5b1fea0
--- /dev/null
+++ b/packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch
@@ -0,0 +1,39 @@
+# strip (and objcopy) fail to set the error code if there is no
+# output file name and the rename of the stripped (or copied) file
+# fails, yet the command fails to do anything.  This fixes both
+# objcopy and strip.
+#
+# modification by bero: Ported to 2.16.91.0.6
+#
+#Signed-off-by: John Bowler <jbowler@acm.org>
+#Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org>
+---
+# binutils/objcopy.c |    8 +++++---
+# 1 file changed, 5 insertions(+), 3 deletions(-)
+#
+Index: src/binutils/objcopy.c
+===================================================================
+--- src.orig/binutils/objcopy.c	2007-08-09 13:26:03.000000000 +0100
++++ src/binutils/objcopy.c	2007-08-09 16:36:12.000000000 +0100
+@@ -2787,8 +2787,9 @@ strip_main (int argc, char *argv[])
+ 	  if (preserve_dates)
+ 	    set_times (tmpname, &statbuf);
+ 	  if (output_file != tmpname)
+-	    smart_rename (tmpname, output_file ? output_file : argv[i],
+-			  preserve_dates);
++	    if (smart_rename (tmpname, output_file ? output_file : argv[i],
++			  preserve_dates))
++	      hold_status = 1;
+ 	  status = hold_status;
+ 	}
+       else
+@@ -3411,7 +3412,8 @@ copy_main (int argc, char *argv[])
+       if (preserve_dates)
+ 	set_times (tmpname, &statbuf);
+       if (tmpname != output_filename)
+-	smart_rename (tmpname, input_filename, preserve_dates);
++	if (smart_rename (tmpname, input_filename, preserve_dates))
++	  status = 1;
+     }
+   else
+     unlink_if_ordinary (tmpname);
diff --git a/packages/binutils/binutils-2.18/binutils-uclibc-100-uclibc-conf.patch b/packages/binutils/binutils-2.18/binutils-uclibc-100-uclibc-conf.patch
new file mode 100644
index 0000000000..8de04e0fe0
--- /dev/null
+++ b/packages/binutils/binutils-2.18/binutils-uclibc-100-uclibc-conf.patch
@@ -0,0 +1,34 @@
+--- binutils-2.18.orig/configure
++++ binutils-2.18/configure
+@@ -2206,7 +2206,7 @@
+   am33_2.0-*-linux*)
+     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+     ;;
+-  sh-*-linux*)
++  sh*-*-linux*)
+     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+     ;;
+   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+@@ -2504,7 +2504,7 @@
+   romp-*-*)
+     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${host}" in
+       i[3456789]86-*-vsta) ;; # don't add gprof back in
+       i[3456789]86-*-go32*) ;; # don't add gprof back in
+--- binutils-2.18.orig/gprof/configure
++++ binutils-2.18/gprof/configure
+@@ -4124,6 +4124,11 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++linux-uclibc*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
++  ;;
++
+ netbsd*)
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
diff --git a/packages/binutils/binutils-2.18/binutils-uclibc-300-001_ld_makefile_patch.patch b/packages/binutils/binutils-2.18/binutils-uclibc-300-001_ld_makefile_patch.patch
new file mode 100644
index 0000000000..04a7e61e25
--- /dev/null
+++ b/packages/binutils/binutils-2.18/binutils-uclibc-300-001_ld_makefile_patch.patch
@@ -0,0 +1,50 @@
+#!/bin/sh -e
+## 001_ld_makefile_patch.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: correct where ld scripts are installed
+## DP: Author: Chris Chimelis <chris@debian.org>
+## DP: Upstream status: N/A
+## DP: Date: ??
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- binutils-2.16.91.0.1/ld/Makefile.am
++++ binutils-2.16.91.0.1/ld/Makefile.am
+@@ -20,7 +20,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- binutils-2.16.91.0.1/ld/Makefile.in
++++ binutils-2.16.91.0.1/ld/Makefile.in
+@@ -268,7 +268,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/packages/binutils/binutils-2.18/binutils-uclibc-300-006_better_file_error.patch b/packages/binutils/binutils-2.18/binutils-uclibc-300-006_better_file_error.patch
new file mode 100644
index 0000000000..f337611edf
--- /dev/null
+++ b/packages/binutils/binutils-2.18/binutils-uclibc-300-006_better_file_error.patch
@@ -0,0 +1,43 @@
+#!/bin/sh -e
+## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Specify which filename is causing an error if the filename is a
+## DP: directory. (#45832)
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c
+--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c	2003-07-23 16:08:09.000000000 +0100
++++ binutils-2.14.90.0.6/bfd/opncls.c	2003-09-10 22:35:00.000000000 +0100
+@@ -150,6 +150,13 @@
+ {
+   bfd *nbfd;
+   const bfd_target *target_vec;
++  struct stat s;
++
++  if (stat (filename, &s) == 0)
++    if (S_ISDIR(s.st_mode)) {
++      bfd_set_error (bfd_error_file_not_recognized);
++      return NULL;
++    }
+ 
+   nbfd = _bfd_new_bfd ();
+   if (nbfd == NULL)
diff --git a/packages/binutils/binutils-2.18/binutils-uclibc-300-012_check_ldrunpath_length.patch b/packages/binutils/binutils-2.18/binutils-uclibc-300-012_check_ldrunpath_length.patch
new file mode 100644
index 0000000000..498651a90c
--- /dev/null
+++ b/packages/binutils/binutils-2.18/binutils-uclibc-300-012_check_ldrunpath_length.patch
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
+## DP: cases where -rpath isn't specified. (#151024)
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
+--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:58.000000000 +0100
++++ binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:59.000000000 +0100
+@@ -692,6 +692,8 @@
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((lib_path) && (strlen (lib_path) == 0))
++		  lib_path = NULL;
+ 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ 						      force))
+ 		break;
+@@ -871,6 +873,8 @@
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++      rpath = NULL;
+   if (! (bfd_elf_size_dynamic_sections
+ 	 (output_bfd, command_line.soname, rpath,
+ 	  command_line.filter_shlib,
diff --git a/packages/binutils/binutils-cross-sdk_2.18.bb b/packages/binutils/binutils-cross-sdk_2.18.bb
new file mode 100644
index 0000000000..a045d9bc9c
--- /dev/null
+++ b/packages/binutils/binutils-cross-sdk_2.18.bb
@@ -0,0 +1,21 @@
+SECTION = "devel"
+require binutils_${PV}.bb
+inherit sdk
+DEPENDS += "flex-native bison-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
+EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \
+		--program-prefix=${TARGET_PREFIX}"
+PR = "r2"
+
+do_stage() {
+	:
+}
+
+do_install () {
+        autotools_do_install
+
+        # Install the libiberty header
+        install -d ${D}${includedir}
+        install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
+        install -m 644 ${S}/include/libiberty.h ${D}${includedir}
+}
diff --git a/packages/binutils/binutils-cross_2.18.bb b/packages/binutils/binutils-cross_2.18.bb
new file mode 100644
index 0000000000..a418dfaab5
--- /dev/null
+++ b/packages/binutils/binutils-cross_2.18.bb
@@ -0,0 +1,3 @@
+require binutils_${PV}.bb
+require binutils-cross.inc
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
diff --git a/packages/binutils/binutils_2.18.bb b/packages/binutils/binutils_2.18.bb
new file mode 100644
index 0000000000..a9b4d995b2
--- /dev/null
+++ b/packages/binutils/binutils_2.18.bb
@@ -0,0 +1,11 @@
+require binutils.inc
+
+SRC_URI = "\
+     ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
+     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
+     file://110-arm-eabi-conf.patch;patch=1 \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
+     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
+     "
-- 
cgit v1.2.3


From db2b07439c2a0798b58a91096385a1fe0766ebbb Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 3 Sep 2007 14:18:11 +0000
Subject: misc-binary-only/prism-firmware.bb : use non broken prism firmware.
 This should ease the connection problems people reported with 1.8.4 and
 improve kismetting

---
 packages/misc-binary-only/prism-firmware.bb          | 14 ++++++++------
 packages/misc-binary-only/prism-firmware/prism-fw.sh |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/misc-binary-only/prism-firmware.bb b/packages/misc-binary-only/prism-firmware.bb
index fefdb0ae22..903c55e15e 100644
--- a/packages/misc-binary-only/prism-firmware.bb
+++ b/packages/misc-binary-only/prism-firmware.bb
@@ -5,22 +5,24 @@ RDEPENDS = "hostap-utils"
 RREPLACES = "prism3-firmware prism3-support"
 RCONFLICTS = "prism3-firmware prism3-support"
 PACKAGE_ARCH = "all"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "http://www.red-bean.com/~proski/firmware/Latest-prism.tar.bz2 \
+SRC_URI = "http://www.red-bean.com/~proski/firmware/primary.tar.bz2 \
+           http://www.red-bean.com/~proski/firmware/1.7.4.tar.bz2 \
            file://prism-fw.sh \
 	   file://hostap.rules"
 
-S = "${WORKDIR}/Latest-prism/"
-
 do_install() {
 	install -d ${D}${base_libdir}/firmware/
 	install -d ${D}${base_libdir}/udev/
 	install -d ${D}${sysconfdir}/pcmcia/
 	install -d ${D}${sysconfdir}/udev/rules.d/
 
-	install -m 0644 primary-RAM/*.hex ${D}${base_libdir}/firmware/
-	install -m 0644 secondary-RAM/rf010804.hex ${D}${base_libdir}/firmware/
+	install -m 0644 ${WORKDIR}/primary/af010104.hex ${D}${base_libdir}/firmware/
+	install -m 0644 ${WORKDIR}/primary/ak010104.hex ${D}${base_libdir}/firmware/
+	install -m 0644 ${WORKDIR}/primary/pm010102.hex ${D}${base_libdir}/firmware/
+
+	install -m 0644 ${WORKDIR}/1.7.4/rf010704.hex ${D}${base_libdir}/firmware/
 
 	install -m 0755 ${WORKDIR}/prism-fw.sh ${D}${base_libdir}/udev/
 	install -m 0644 ${WORKDIR}/hostap.rules ${D}${sysconfdir}/udev/rules.d/
diff --git a/packages/misc-binary-only/prism-firmware/prism-fw.sh b/packages/misc-binary-only/prism-firmware/prism-fw.sh
index 96a2457f33..619f612be1 100644
--- a/packages/misc-binary-only/prism-firmware/prism-fw.sh
+++ b/packages/misc-binary-only/prism-firmware/prism-fw.sh
@@ -4,7 +4,7 @@ CARD_ID=`/usr/sbin/hostap_diag $INTERFACE|grep NICID|awk '{print $2}'|sed -e 's/
 
 # 801d cards lack even Primary firmware so we cannot use hostap_diag
 PRI=/lib/firmware/pm010102.hex 
-STA=/lib/firmware/rf010804.hex
+STA=/lib/firmware/rf010704.hex
 
 if [ $CARD_ID = '800c' ] || [ $CARD_ID = '8013' ] || [ $CARD_ID = '8017' ] || \
    [ $CARD_ID = '801b' ] || [ $CARD_ID = '8022' ] || [ $CARD_ID = '8023' ] ; then
-- 
cgit v1.2.3


From 081e84a5e89eebad6e21fa98ecf9736dfd38551d Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Mon, 3 Sep 2007 14:43:47 +0000
Subject: packages/qte/qtopia-core: Add QtopiaCore version 4.3.1

---
 packages/qte/qtopia-core_4.3.1.bb | 222 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 222 insertions(+)
 create mode 100644 packages/qte/qtopia-core_4.3.1.bb

diff --git a/packages/qte/qtopia-core_4.3.1.bb b/packages/qte/qtopia-core_4.3.1.bb
new file mode 100644
index 0000000000..73cfb7f6da
--- /dev/null
+++ b/packages/qte/qtopia-core_4.3.1.bb
@@ -0,0 +1,222 @@
+SUMMARY = "QtopiaCore"
+SECTION = "libs"
+LICENSE = "GPL"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+DEPENDS = "freetype tslib"
+
+PR = "r1"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
+           file://linux-oe-qmake.conf"
+
+S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
+
+inherit pkgconfig
+
+# Qmake gets confused by environment variables, as it builds both HOST
+# and TARGET objects. The correct compiler settings come from the mkspec
+# and are set with the OE_QMAKE_ variables
+PARALLEL_MAKE = ""
+EXTRA_OEMAKE = " MAKEFLAGS= "
+
+# This stuff could also be done by inheriting qmake, but I didn't want to
+# bother with the qmake separation from the Qtopia configure. This separation
+# is probably nothing more than a patch on the configure and setting some
+# environment variables to use our own qmake/moc/uic, but that's something
+# to figure out later.
+export OE_QMAKE_CC="${CC}"
+export OE_QMAKE_CFLAGS="${CFLAGS}"
+export OE_QMAKE_CXX="${CXX}"
+export OE_QMAKE_CXXFLAGS="-fno-exceptions ${CXXFLAGS}"
+export OE_QMAKE_LDFLAGS="${LDFLAGS}"
+export OE_QMAKE_LINK="${CXX}"
+export OE_QMAKE_AR="${AR}"
+export OE_QMAKE_RANLIB="${RANLIB}"
+export OE_QMAKE_STRIP="echo"
+export OE_QMAKE_RPATH="-Wl,-rpath-link,"
+export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
+export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
+export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include"
+export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib"
+
+require qte-functions.inc
+QT_ARCH := "${@qte_arch(d)}"
+
+# FIXME use info.bbclass once it has been commited
+QT_ENDIAN = "-little-endian"
+
+# We don't build the examples and demos atm. They're quite big and not used
+# frequently, only for testing maybe. Feel free to change and to package
+# them separately.
+QT_CONFIG_FLAGS = "-release \
+    -no-cups -no-accessibility \
+    -nomake demos -nomake examples -nomake tools -reduce-relocations \
+    -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}"
+
+do_configure() {
+    # Hack to honor our compiler flags
+    sed -i s/-O2//g ${S}/mkspecs/*/qmake.conf
+    sed -i s/-O2//g ${S}/mkspecs/*/*/qmake.conf
+
+
+    # Install the OE build templates (something which might be done
+    # by inheriting qmake)
+    for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
+    do
+        install -d ${S}/mkspecs/$template
+        install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
+        ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
+    done
+
+    # The Qmake Makefile generation doesn't like these environment
+    # variables, as they mess up the HOST tools builds
+    unset CC
+    unset CXX
+    unset CFLAGS
+    unset CXXFLAGS
+    unset LDFLAGS
+
+    # For rationale behind the installation locations, see remark above
+    echo yes | ./configure -v \
+        -prefix ${prefix} \
+        -bindir ${bindir} \
+        -libdir ${libdir} \
+        -docdir ${docdir}/qtopia \
+        -headerdir ${includedir} \
+        -plugindir ${datadir}/qtopia/plugins \
+        -datadir ${datadir} \
+        -translationdir ${datadir}/qtopia/translations \
+        -sysconfdir ${sysconfdir} \
+        -examplesdir ${bindir}/qtopia/examples \
+        -demosdir ${bindir}/qtopia/demos \
+        -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \
+        -xplatform linux-oe-g++ \
+        ${QT_CONFIG_FLAGS} \
+        -L${STAGING_LIBDIR} -I${STAGING_INCDIR}
+}
+
+#
+# Fixup some pkgconfig files
+# moc_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/moc
+# uic_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/uic
+#
+# Libs: -L${libdir} -lQtNetwork -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib  $(LIBS_EXTRA) -lQtCore -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib -lm -lrt -lpthread -ldl
+#
+do_compile_append() {
+    cd ${S}/lib/pkgconfig
+    sed -i s#"-L${S}/lib"##g *.pc
+    sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# *.pc
+    sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# *.pc
+}
+
+do_stage_append() {
+    echo "Fixing up Qt"
+    cd ${STAGING_LIBDIR}/pkgconfig
+    sed -i s#"-L${S}/lib"##g Qt*.pc
+    sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc
+    sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc
+}
+
+do_install() {
+    oe_runmake install INSTALL_ROOT=${D}
+
+    # These are host binaries, we should only use them in staging
+    rm -rf ${D}/${bindir}
+    rm -rf ${D}/${datadir}/mkspecs
+        
+    touch ${D}/${libdir}/fonts/fontdir
+}
+
+# We might want to package all the libraries separately, so you can really
+# fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb.
+# What should these packages be called? I'm tempted to call them the same
+# as in qt4 version, as the API is supposed to be compatible, e.g.
+# libqtcore4 and libqtgui4. This will however conflict if you have QT and
+# Qtopia, but this is something you don't want anyway, I guess.
+# Another solution is making virtual/libqtfoo4, and DEPENDing on that one
+# and let both the PACKAGES in QT and Qtopia PROVIDE these. The packages
+# themselves could then be called libqtopiafoo4.
+# I'll postpone this discussion by not making separate Qtopia packages.
+
+# Also, I don't package the plugins and translations atm, I don't use them
+# and I don't feel like thinking about a sensible separation.
+
+PACKAGES =+ " libqtcore libqtcore-dev libqtcore-dbg \
+              libqtxml libqtxml-dev libqtxml-dbg \
+              libqtgui libqtgui-dev libqtgui-dbg \
+              libqtsql libqtsql-dev libqtsql-dbg \
+              libqtnetwork libqtnetwork-dev libqtnetwork-dbg \
+              libqtsvg libqtsvg-dev libqtsvg-dbg \
+              libqt3support libqt3support-dev libqt3support-dbg \
+              qtopia-core-plugins qtopia-core-plugins-dbg \
+              libqtscript libqtscript-dev libqtscript-dbg \
+              "
+
+PACKAGES += " ${PN}-fonts "
+
+# The default included fonts are around 75MB and consist of a number of
+# FreeType-renderable fonts as well as QPF (Qtopia Prerendered Fonts).
+# As FreeType is generally slow on embedded platforms, and 75MB is
+# quite huge, we downsize the fonts dir in the do_install. I've decided
+# to include only the QPF (Helvetica and Fixed), amounting to 500KB. This
+# also results in tremendously faster application startup time.
+FILES_libqtcore += " ${libdir}/fonts/helvetic* ${libdir}/fonts/fixed* ${D}/${libdir}/fonts/fontdir"
+FILES_${PN}-fonts = "${libdir}/fonts"
+
+FILES_qtopia-core-plugins += "${datadir}/qtopia/plugins/*/*.so"
+FILES_qtopia-core-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so"
+
+FILES_libqtcore += "${libdir}/libQtCore.so.*"
+FILES_libqtxml += "${libdir}/libQtXml.so.*"
+FILES_libqtgui += "${libdir}/libQtGui.so.*"
+FILES_libqtsql += "${libdir}/libQtSql.so.*"
+FILES_libqtnetwork += "${libdir}/libQtNetwork.so.*"
+FILES_libqtsvg += "${libdir}/libQtSvg.so.*"
+FILES_libqt3support += "${libdir}/libQt3Support.so.*"
+FILES_libqtscript += "${libdir}/libQtScript.so.*"
+
+FILES_libqtcore-dev += "${libdir}/*QtCore.*"
+FILES_libqtxml-dev += "${libdir}/*QtXml.*"
+FILES_libqtgui-dev += "${libdir}/*QtGui.*"
+FILES_libqtsql-dev += "${libdir}/*QtSql.*"
+FILES_libqtnetwork-dev += "${libdir}/*QtNetwork.*"
+FILES_libqtsvg-dev += "${libdir}/*QtSvg.*"
+FILES_libqt3support-dev += "${libdir}/*Qt3Support.*"
+FILES_libqtscript-dev += "${libdir}/*QtScript.*"
+
+FILES_libqtcore-dbg += "${libdir}/.debug/libQtCore*"
+FILES_libqtxml-dbg += "${libdir}/.debug/libQtXml*"
+FILES_libqtgui-dbg += "${libdir}/.debug/libQtGui*"
+FILES_libqtsql-dbg += "${libdir}/.debug/libQtSql*"
+FILES_libqtnetwork-dbg += "${libdir}/.debug/libQtNetwork*"
+FILES_libqtsvg-dbg += "${libdir}/.debug/libQtSvg*"
+FILES_libqt3support-dbg += "${libdir}/.debug/libQt3Support*"
+FILES_libqtscript-dbg += "${libdir}/.debug/libQtScript*"
+
+
+python populate_packages_prepend() {
+	translationdir = bb.data.expand('${datadir}/qtopia/translations/', d)
+	do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' )
+}
+
+
+
+STAGE_TEMP = "${WORKDIR}/temp-staging"
+do_stage() {
+    rm -rf ${STAGE_TEMP}
+    mkdir -p ${STAGE_TEMP}
+    oe_runmake install INSTALL_ROOT=${STAGE_TEMP}
+
+    install -d ${STAGING_INCDIR}/qtopiacore4
+    install -d ${STAGING_LIBDIR}/qtopiacore4
+    cp -af ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/qtopiacore4/
+
+    for i in ${STAGE_TEMP}/${libdir}/*.la
+    do
+        oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4
+    done
+
+    rm -rf ${STAGE_TEMP}
+}
+
-- 
cgit v1.2.3


From 5c6262bc5a3b1ed73553a4f3e40f324a2a7772ad Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Mon, 3 Sep 2007 14:45:17 +0000
Subject: MAINTAINERS: Add the Qtopia interest...

---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 1842441ff5..f9532a36ab 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -73,7 +73,7 @@ Person:     Holger Hans Peter Freyther
 Mail:       zecke@selfish.org
 Website:    http://www.openembedded.org/~zecke
 Interests:  icecream, insanity, QA
-Recipes:    sqlite3, xine
+Recipes:    qtopia*, sqlite3, xine
 
 Person:     Jamie Lenehan
 Mail:       lenehan@twibble.org
-- 
cgit v1.2.3


From 19ec4cd1ca4a876c63ee75646fc627c374c067eb Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 3 Sep 2007 19:37:44 +0000
Subject: libmokopanelui2: add new dependency on matchbox-panel-2

---
 packages/openmoko2/libmokopanelui2_svn.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb
index bfeb22fd7b..03159cc864 100644
--- a/packages/openmoko2/libmokopanelui2_svn.bb
+++ b/packages/openmoko2/libmokopanelui2_svn.bb
@@ -1,11 +1,10 @@
 SECTION = "openmoko/libs"
-DEPENDS = "gtk+"
-PV = "0.1.0+svn${SVNREV}"
-PR = "r1" 
+DEPENDS = "gtk+ matchbox-panel-2"
+PV = "0.3.0+svn${SVNREV}"
+PR = "r0"
 
 inherit openmoko2
 
 do_stage() {
         autotools_stage_all
 }
-
-- 
cgit v1.2.3


From 686c5dbff2ad6918861584f81a91a9e33a1195ff Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 3 Sep 2007 19:58:28 +0000
Subject: samba: depend on virtual/libiconv and supply path to it to fix
 building - taken from #2900

---
 packages/samba/samba.inc        | 3 ++-
 packages/samba/samba_3.0.23c.bb | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
index aa3083d1f6..bcae4e7885 100644
--- a/packages/samba/samba.inc
+++ b/packages/samba/samba.inc
@@ -1,6 +1,6 @@
 SECTION = "console/network"
 LICENSE = "GPL"
-DEPENDS = "readline"
+DEPENDS = "readline virtual/libiconv"
 
 SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
            file://configure.patch;patch=1 \
@@ -10,6 +10,7 @@ S = "${WORKDIR}/samba-${PV}/source"
 inherit autotools
 
 EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
+              --with-libiconv=${STAGING_LIBDIR}/.. \
 	      --without-ads --without-automount --with-smbmount'
 
 PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc"
diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb
index 5317bcc62a..74f0593150 100644
--- a/packages/samba/samba_3.0.23c.bb
+++ b/packages/samba/samba_3.0.23c.bb
@@ -1,6 +1,8 @@
 require samba.inc
 inherit update-rc.d
 
+PR = "r1"
+
 SRC_URI += "file://config-lfs.patch;patch=1 \
 	   file://init \
            file://quota.patch;patch=1;pnum=0 \
-- 
cgit v1.2.3


From e4aab6e192d7ef2a5330dd7e6bb2c1c2bb8e28fe Mon Sep 17 00:00:00 2001
From: Cliff Brake <cbrake@bec-systems.com>
Date: Mon, 3 Sep 2007 20:29:49 +0000
Subject: angstrom-minimal-image-with-mtd-utils.bb: set image base name

---
 packages/images/angstrom-minimal-image-with-mtd-utils.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/images/angstrom-minimal-image-with-mtd-utils.bb b/packages/images/angstrom-minimal-image-with-mtd-utils.bb
index 635833af4e..740c39126c 100644
--- a/packages/images/angstrom-minimal-image-with-mtd-utils.bb
+++ b/packages/images/angstrom-minimal-image-with-mtd-utils.bb
@@ -5,3 +5,5 @@
 require angstrom-minimal-image.bb
 RDEPENDS += "mtd-utils"
 
+export IMAGE_BASENAME = "minimalist-image-mtdutils"
+
-- 
cgit v1.2.3


From cab401ad53a4fca1328583f1ba6860f4180ea900 Mon Sep 17 00:00:00 2001
From: Cliff Brake <cbrake@bec-systems.com>
Date: Mon, 3 Sep 2007 20:30:34 +0000
Subject: mono 1.2.5: add 1.2.4, drop 1.2.5-pre5

---
 packages/mono/mono-1.2.4+1.2.5pre5/.mtn2git_empty  |  0
 packages/mono/mono-1.2.4+1.2.5pre5/configure.patch | 67 ----------------------
 packages/mono/mono-1.2.5/.mtn2git_empty            |  0
 packages/mono/mono-1.2.5/configure.patch           | 67 ++++++++++++++++++++++
 packages/mono/mono-native_1.2.5.bb                 | 10 ++++
 packages/mono/mono-native_1.2.5pre5.bb             | 10 ----
 packages/mono/mono_1.2.5.bb                        | 23 ++++++++
 packages/mono/mono_1.2.5.inc                       | 16 ++++++
 packages/mono/mono_1.2.5pre5.bb                    | 23 --------
 packages/mono/mono_1.2.5pre5.inc                   | 18 ------
 10 files changed, 116 insertions(+), 118 deletions(-)
 delete mode 100644 packages/mono/mono-1.2.4+1.2.5pre5/.mtn2git_empty
 delete mode 100644 packages/mono/mono-1.2.4+1.2.5pre5/configure.patch
 create mode 100644 packages/mono/mono-1.2.5/.mtn2git_empty
 create mode 100644 packages/mono/mono-1.2.5/configure.patch
 create mode 100644 packages/mono/mono-native_1.2.5.bb
 delete mode 100644 packages/mono/mono-native_1.2.5pre5.bb
 create mode 100644 packages/mono/mono_1.2.5.bb
 create mode 100644 packages/mono/mono_1.2.5.inc
 delete mode 100644 packages/mono/mono_1.2.5pre5.bb
 delete mode 100644 packages/mono/mono_1.2.5pre5.inc

diff --git a/packages/mono/mono-1.2.4+1.2.5pre5/.mtn2git_empty b/packages/mono/mono-1.2.4+1.2.5pre5/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/mono/mono-1.2.4+1.2.5pre5/configure.patch b/packages/mono/mono-1.2.4+1.2.5pre5/configure.patch
deleted file mode 100644
index 1553115c0e..0000000000
--- a/packages/mono/mono-1.2.4+1.2.5pre5/configure.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: mono-1.2.5/configure.in
-===================================================================
---- mono-1.2.5.orig/configure.in
-+++ mono-1.2.5/configure.in
-@@ -1134,6 +1134,8 @@ if test x$platform_win32 = xno; then
- 		], [
- 				AC_MSG_RESULT(no)
- 				with_tls=pthread
-+		], [
-+				AC_MSG_RESULT(yes)
- 		])
- 	fi
- 
-@@ -1236,6 +1238,9 @@ if test x$platform_win32 = xno; then
- 		], [
- 				with_sigaltstack=no
- 				AC_MSG_RESULT(no)
-+		], [
-+				AC_MSG_RESULT(yes)
-+				AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
- 		])
- 	fi
- 
-@@ -1893,24 +1898,26 @@ if test "x$with_tls" = "x__thread"; then
- 	])
- fi
- 
--if test ${TARGET} = ARM; then
--	dnl ******************************************
--	dnl *** Check to see what FPU is available ***
--	dnl ******************************************
--	AC_MSG_CHECKING(which FPU to use)
--
--	AC_TRY_COMPILE([], [
--		__asm__ ("ldfd f0, [r0]");
--		], fpu=FPA, [
--			AC_TRY_COMPILE([], [
--				__asm__ ("fldd d0, [r0]");
--			], fpu=VFP, fpu=NONE)
--		])
-+#if test ${TARGET} = ARM; then
-+#	dnl ******************************************
-+#	dnl *** Check to see what FPU is available ***
-+#	dnl ******************************************
-+#	AC_MSG_CHECKING(which FPU to use)
-+#
-+#	AC_TRY_COMPILE([], [
-+#		__asm__ ("ldfd f0, [r0]");
-+#		], fpu=FPA, [
-+#			AC_TRY_COMPILE([], [
-+#				__asm__ ("fldd d0, [r0]");
-+#			], fpu=VFP, fpu=NONE)
-+#		])
-+#
-+#	AC_MSG_RESULT($fpu)
-+#	CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
-+#	unset fpu
-+#fi
- 
--	AC_MSG_RESULT($fpu)
--	CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
--	unset fpu
--fi
-+	CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1"
- 
- if test ${TARGET} = unknown; then
- 	CPPFLAGS="$CPPFLAGS -DNO_PORT"
diff --git a/packages/mono/mono-1.2.5/.mtn2git_empty b/packages/mono/mono-1.2.5/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/mono/mono-1.2.5/configure.patch b/packages/mono/mono-1.2.5/configure.patch
new file mode 100644
index 0000000000..1553115c0e
--- /dev/null
+++ b/packages/mono/mono-1.2.5/configure.patch
@@ -0,0 +1,67 @@
+Index: mono-1.2.5/configure.in
+===================================================================
+--- mono-1.2.5.orig/configure.in
++++ mono-1.2.5/configure.in
+@@ -1134,6 +1134,8 @@ if test x$platform_win32 = xno; then
+ 		], [
+ 				AC_MSG_RESULT(no)
+ 				with_tls=pthread
++		], [
++				AC_MSG_RESULT(yes)
+ 		])
+ 	fi
+ 
+@@ -1236,6 +1238,9 @@ if test x$platform_win32 = xno; then
+ 		], [
+ 				with_sigaltstack=no
+ 				AC_MSG_RESULT(no)
++		], [
++				AC_MSG_RESULT(yes)
++				AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
+ 		])
+ 	fi
+ 
+@@ -1893,24 +1898,26 @@ if test "x$with_tls" = "x__thread"; then
+ 	])
+ fi
+ 
+-if test ${TARGET} = ARM; then
+-	dnl ******************************************
+-	dnl *** Check to see what FPU is available ***
+-	dnl ******************************************
+-	AC_MSG_CHECKING(which FPU to use)
+-
+-	AC_TRY_COMPILE([], [
+-		__asm__ ("ldfd f0, [r0]");
+-		], fpu=FPA, [
+-			AC_TRY_COMPILE([], [
+-				__asm__ ("fldd d0, [r0]");
+-			], fpu=VFP, fpu=NONE)
+-		])
++#if test ${TARGET} = ARM; then
++#	dnl ******************************************
++#	dnl *** Check to see what FPU is available ***
++#	dnl ******************************************
++#	AC_MSG_CHECKING(which FPU to use)
++#
++#	AC_TRY_COMPILE([], [
++#		__asm__ ("ldfd f0, [r0]");
++#		], fpu=FPA, [
++#			AC_TRY_COMPILE([], [
++#				__asm__ ("fldd d0, [r0]");
++#			], fpu=VFP, fpu=NONE)
++#		])
++#
++#	AC_MSG_RESULT($fpu)
++#	CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
++#	unset fpu
++#fi
+ 
+-	AC_MSG_RESULT($fpu)
+-	CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
+-	unset fpu
+-fi
++	CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1"
+ 
+ if test ${TARGET} = unknown; then
+ 	CPPFLAGS="$CPPFLAGS -DNO_PORT"
diff --git a/packages/mono/mono-native_1.2.5.bb b/packages/mono/mono-native_1.2.5.bb
new file mode 100644
index 0000000000..0f1391cd25
--- /dev/null
+++ b/packages/mono/mono-native_1.2.5.bb
@@ -0,0 +1,10 @@
+require mono_1.2.5.inc
+PR = "r2"
+DEPENDS = "glib-2.0-native"
+
+inherit native
+
+#do_stage_prepend() {
+#	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
+#}
+
diff --git a/packages/mono/mono-native_1.2.5pre5.bb b/packages/mono/mono-native_1.2.5pre5.bb
deleted file mode 100644
index 4664cf8310..0000000000
--- a/packages/mono/mono-native_1.2.5pre5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require mono_1.2.5pre5.inc
-PR = "r2"
-DEPENDS = "glib-2.0-native"
-
-inherit native
-
-#do_stage_prepend() {
-#	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
-#}
-
diff --git a/packages/mono/mono_1.2.5.bb b/packages/mono/mono_1.2.5.bb
new file mode 100644
index 0000000000..c0a4cfb223
--- /dev/null
+++ b/packages/mono/mono_1.2.5.bb
@@ -0,0 +1,23 @@
+require mono_1.2.5.inc
+
+#DEPENDS = "mono-native glib-2.0"
+# for now, we skip the mono-native build -- just install
+# mono using your distro package manager for now
+# after we get the target version working, we'll worry
+# about the native package for systems that don't have mono
+# installed
+DEPENDS = "glib-2.0"
+
+PR = "r0"
+
+SRC_URI += "file://configure.patch;patch=1"
+
+do_install_append() {
+	install -d ${D}${libdir}/mono/1.0/
+	cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/
+}
+
+PACKAGES =+ "mono-dll"
+FILES_mono-dll = "${libdir}/mono/1.0/"
+
+
diff --git a/packages/mono/mono_1.2.5.inc b/packages/mono/mono_1.2.5.inc
new file mode 100644
index 0000000000..0e0df1caf2
--- /dev/null
+++ b/packages/mono/mono_1.2.5.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "Mono Programming Language"
+SECTION = "devel/mono"
+LICENSE = "GPL LGPL X11"
+
+# the md5 sum check is required because Novell does not version their pre release versions of mono
+# if the md5sum check fails, contact cbrake on #oe
+# checksums are stored in conf/checksums.ini
+SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.5.tar.bz2"
+
+S = "${WORKDIR}/mono-1.2.5"
+
+inherit autotools
+EXTRA_OECONF = "--disable-mcs-build"
+EXTRA_OECONF_arm = "--without-tls"
+EXTRA_OECONF_mipsel = "--without-tls"
+
diff --git a/packages/mono/mono_1.2.5pre5.bb b/packages/mono/mono_1.2.5pre5.bb
deleted file mode 100644
index 3ba24e9a5a..0000000000
--- a/packages/mono/mono_1.2.5pre5.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require mono_1.2.5pre5.inc
-
-#DEPENDS = "mono-native glib-2.0"
-# for now, we skip the mono-native build -- just install
-# mono using your distro package manager for now
-# after we get the target version working, we'll worry
-# about the native package for systems that don't have mono
-# installed
-DEPENDS = "glib-2.0"
-
-PR = "r3"
-
-SRC_URI += "file://configure.patch;patch=1"
-
-do_install_append() {
-	install -d ${D}${libdir}/mono/1.0/
-	cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/
-}
-
-PACKAGES =+ "mono-dll"
-FILES_mono-dll = "${libdir}/mono/1.0/"
-
-
diff --git a/packages/mono/mono_1.2.5pre5.inc b/packages/mono/mono_1.2.5pre5.inc
deleted file mode 100644
index 802e64156a..0000000000
--- a/packages/mono/mono_1.2.5pre5.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Mono Programming Language"
-SECTION = "devel/mono"
-LICENSE = "GPL LGPL X11"
-
-PV = "1.2.4+1.2.5pre5"
-
-# the md5 sum check is required because Novell does not version their pre release versions of mono
-# if the md5sum check fails, contact cbrake on #oe
-# checksums are stored in conf/checksums.ini
-SRC_URI = "http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.5.tar.bz2"
-
-S = "${WORKDIR}/mono-1.2.5"
-
-inherit autotools
-EXTRA_OECONF = "--disable-mcs-build"
-EXTRA_OECONF_arm = "--without-tls"
-EXTRA_OECONF_mipsel = "--without-tls"
-
-- 
cgit v1.2.3


From 9532a569a32d1882a73123dd4bfe53ac91b63354 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 4 Sep 2007 01:11:30 +0000
Subject: scummvm: Put it back the (broken) way it was.  Changing to
 STAGING_BINDIR_CROSS doesn't help, cause that doesn't end in a 'bin'
 directory, and the configure script in scummvm adds a 'bin' to the end of the
 prefix given. Someone else who cares will need to fix it properly.

---
 packages/scummvm/scummvm.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc
index 9e977c2a04..127754ffb8 100644
--- a/packages/scummvm/scummvm.inc
+++ b/packages/scummvm/scummvm.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.scummvm.org"
 SECTION = "games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2"
 
@@ -11,7 +11,7 @@ inherit autotools
 
 EXTRA_OECONF = "--host=${HOST_SYS} \
 		--backend=sdl \
-		--with-sdl-prefix=${STAGING_BINDIR_CROSS}/.. \
+		--with-sdl-prefix=${STAGING_BINDIR_NATIVE}/.. \
 		--disable-alsa \
 		--prefix=${prefix} \
 		--with-ogg-prefix=${STAGING_LIBDIR}/.. \
-- 
cgit v1.2.3


From 95b805455fd6e2e1cd058eeeddfe200277a8c44a Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 4 Sep 2007 01:12:01 +0000
Subject: task-openmoko-feed: Removed scummvm cause it's broken and too hard
 for me to fix.

---
 packages/tasks/task-openmoko-feed.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index f75cf3d450..f3e3ee8456 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
 
 inherit task
 
@@ -21,7 +21,6 @@ RDEPENDS_task-openmoko-feed = "\
   python-pygtk \
   python-pyserial \
   ruby \
-  scummvm \
   timezones \
   tor \
   vnc \
-- 
cgit v1.2.3


From e3755ff1529d55b7c4edeeb7cc0ffefa5a584bb0 Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Tue, 4 Sep 2007 02:23:15 +0000
Subject: madwifi-ng: added recipe for the latest snapshop in order to provide
 support for more recent kernels.  Default preference = -1, since this version
 will not build on BE kernels.

---
 packages/madwifi/madwifi-ng_r2702-20070903.bb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 packages/madwifi/madwifi-ng_r2702-20070903.bb

diff --git a/packages/madwifi/madwifi-ng_r2702-20070903.bb b/packages/madwifi/madwifi-ng_r2702-20070903.bb
new file mode 100644
index 0000000000..cf614c96ae
--- /dev/null
+++ b/packages/madwifi/madwifi-ng_r2702-20070903.bb
@@ -0,0 +1,14 @@
+# Bitbake recipe for the madwifi-ng driver
+
+# Don't use this unless you know what you're doing -- this version does
+# *NOT* build on BE kernels.
+DEFAULT_PREFERENCE = "-1"
+
+# Disable stripping of kernel modules, since this action strips too
+# much out, and the resulting module won't load.
+INHIBIT_PACKAGE_STRIP = "1"
+
+require madwifi-ng_r.inc
+
+# PR set after the include, to override what's set in the included file.
+PR = "r0"
-- 
cgit v1.2.3


From b01e3c3c6d4e218b4f344df0f164f7b50045afa4 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 4 Sep 2007 06:49:01 +0000
Subject: bitbake: require 1.8.8

---
 conf/sanity.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/sanity.conf b/conf/sanity.conf
index 163b63195e..fe1e2282e4 100644
--- a/conf/sanity.conf
+++ b/conf/sanity.conf
@@ -3,6 +3,6 @@
 # See sanity.bbclass
 #
 # Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "1.8.5"
+BB_MIN_VERSION = "1.8.8"
 INHERIT += "sanity"
 
-- 
cgit v1.2.3


From ff