From 6ffd9d3b78882f811d014c65cb52bfc9503fb218 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 11 Apr 2007 07:10:20 +0000
Subject: arm-kernel-shim: Added version 1.4

---
 packages/arm-kernel-shim/arm-kernel-shim_1.4.bb | 77 +++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 packages/arm-kernel-shim/arm-kernel-shim_1.4.bb

diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb
new file mode 100644
index 0000000000..3b20d33a7c
--- /dev/null
+++ b/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb
@@ -0,0 +1,77 @@
+DESCRIPTION = "ARM Kernel Shim"
+SECTION = ""
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+# PR = "r0"
+
+COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
+
+SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \
+	   file://passthrough-atags.patch;patch=1 \
+	   file://cmdline_if_none.patch;patch=1 \
+	   file://config-nslu2.h \
+	   file://config-nas100d.h \
+	   file://config-dsmg600.h \
+	   file://config-fsg3.h"
+
+S = ${WORKDIR}/arm-kernel-shim-${PV}/1.3
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+	mv ${S}/config.h ${S}/config.h.orig
+	# NSLU2
+	if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+		sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+			${WORKDIR}/config-nslu2.h > ${S}/config.h
+	else
+		sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+			${WORKDIR}/config-nslu2.h > ${S}/config.h
+	fi
+	rm -f ${S}/main.o
+	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2
+	make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed"
+	# NAS100d
+	if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+		sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+			${WORKDIR}/config-nas100d.h > ${S}/config.h
+	else
+		sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+			${WORKDIR}/config-nas100d.h > ${S}/config.h
+	fi
+	rm -f ${S}/main.o
+	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d
+	make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed"
+	# DSMG-600
+	if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+		sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+			${WORKDIR}/config-dsmg600.h > ${S}/config.h
+	else
+		sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+			${WORKDIR}/config-dsmg600.h > ${S}/config.h
+	fi
+	rm -f ${S}/main.o
+	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600
+	make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed"
+	# FSG-3
+	if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+		sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+			${WORKDIR}/config-fsg3.h > ${S}/config.h
+	else
+		sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+			${WORKDIR}/config-fsg3.h > ${S}/config.h
+	fi
+	rm -f ${S}/main.o
+	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3
+	make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed"
+	mv ${S}/config.h.orig ${S}/config.h
+}
+
+do_populate_staging() {
+	install -d ${STAGING_LOADER_DIR}
+	cp ${S}/arm-kernel-shim-nslu2.bin ${STAGING_LOADER_DIR}/
+	cp ${S}/arm-kernel-shim-nas100d.bin ${STAGING_LOADER_DIR}/
+	cp ${S}/arm-kernel-shim-dsmg600.bin ${STAGING_LOADER_DIR}/
+	cp ${S}/arm-kernel-shim-fsg3.bin ${STAGING_LOADER_DIR}/
+}
-- 
cgit v1.2.3


From eab392b728a3709e26f0f242e04200d18f0be60d Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 11 Apr 2007 16:15:34 +0000
Subject: disapproval of revision '8d044c26b37ff724e3f1c34dde3455615ef675c3'

---
 packages/gpephone/gpe-applauncher_0.7.bb |  5 ++---
 packages/gpephone/iksemel_1.2.bb         | 14 ++++++++++++++
 packages/iksemel                         | 14 --------------
 3 files changed, 16 insertions(+), 17 deletions(-)
 create mode 100644 packages/gpephone/iksemel_1.2.bb
 delete mode 100644 packages/iksemel

diff --git a/packages/gpephone/gpe-applauncher_0.7.bb b/packages/gpephone/gpe-applauncher_0.7.bb
index b776b72385..349330047b 100644
--- a/packages/gpephone/gpe-applauncher_0.7.bb
+++ b/packages/gpephone/gpe-applauncher_0.7.bb
@@ -2,15 +2,14 @@ LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r2"
+PR          = "r1"
 
 DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libxsettings-client"
 
 GPE_TARBALL_SUFFIX= "gz"
 inherit gpephone autotools
 
-SRC_URI += " file://default-icon.patch;patch=1;pnum=0 \
-             file://fixfree.patch;patch=1"
+SRC_URI += " file://default-icon.patch;patch=1;pnum=0"
 
 #EXTRA_OECONF = "--enable-gridlayout"
 
diff --git a/packages/gpephone/iksemel_1.2.bb b/packages/gpephone/iksemel_1.2.bb
new file mode 100644
index 0000000000..903d8f046d
--- /dev/null
+++ b/packages/gpephone/iksemel_1.2.bb
@@ -0,0 +1,14 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "A simple, powerful XML-parsing library written in C."
+SECTION = "libs"
+PRIORITY    = "optional"
+DEPENDS     = "glibc gnutls"
+PR          = "r0"
+
+inherit pkgconfig autotools
+
+SRC_URI = "http://files.jabberstudio.org/iksemel/${P}.tar.gz"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/iksemel b/packages/iksemel
deleted file mode 100644
index 903d8f046d..0000000000
--- a/packages/iksemel
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE     = "LGPL"
-DESCRIPTION = "A simple, powerful XML-parsing library written in C."
-SECTION = "libs"
-PRIORITY    = "optional"
-DEPENDS     = "glibc gnutls"
-PR          = "r0"
-
-inherit pkgconfig autotools
-
-SRC_URI = "http://files.jabberstudio.org/iksemel/${P}.tar.gz"
-
-do_stage () {
-	autotools_stage_all
-}
-- 
cgit v1.2.3


From 8dcda81ce278514686d55fac9a1b65b8b0a5b021 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 11 Apr 2007 16:15:54 +0000
Subject: disapproval of revision '7861396822409ca6c3e24762209c49eec2b2d690'

---
 packages/gloox                   | 15 ---------------
 packages/gpephone/gloox_0.8.1.bb | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 packages/gloox
 create mode 100644 packages/gpephone/gloox_0.8.1.bb

diff --git a/packages/gloox b/packages/gloox
deleted file mode 100644
index 09004a8182..0000000000
--- a/packages/gloox
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE     = "GPL"
-DESCRIPTION = "full-featured Jabber/XMPP client library."
-SECTION = "networking"
-PRIORITY    = "optional"
-PR          = "r0"
-
-DEPENDS = "iksemel libidn gnutls"
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://camaya.net/download/${P}.tar.bz2"
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/gpephone/gloox_0.8.1.bb b/packages/gpephone/gloox_0.8.1.bb
new file mode 100644
index 0000000000..09004a8182
--- /dev/null
+++ b/packages/gpephone/gloox_0.8.1.bb
@@ -0,0 +1,15 @@
+LICENSE     = "GPL"
+DESCRIPTION = "full-featured Jabber/XMPP client library."
+SECTION = "networking"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "iksemel libidn gnutls"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://camaya.net/download/${P}.tar.bz2"
+
+do_stage () {
+	autotools_stage_all
+}
-- 
cgit v1.2.3


From 7f2f33a19771f9944d2e49b84ebbcc9a39d055fc Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 11 Apr 2007 16:29:52 +0000
Subject: iksemel: Move to its own directory.

---
 packages/gpephone/iksemel_1.2.bb | 14 --------------
 packages/iksemel/.mtn2git_empty  |  0
 packages/iksemel/iksemel_1.2.bb  | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 packages/gpephone/iksemel_1.2.bb
 create mode 100644 packages/iksemel/.mtn2git_empty
 create mode 100644 packages/iksemel/iksemel_1.2.bb

diff --git a/packages/gpephone/iksemel_1.2.bb b/packages/gpephone/iksemel_1.2.bb
deleted file mode 100644
index 903d8f046d..0000000000
--- a/packages/gpephone/iksemel_1.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE     = "LGPL"
-DESCRIPTION = "A simple, powerful XML-parsing library written in C."
-SECTION = "libs"
-PRIORITY    = "optional"
-DEPENDS     = "glibc gnutls"
-PR          = "r0"
-
-inherit pkgconfig autotools
-
-SRC_URI = "http://files.jabberstudio.org/iksemel/${P}.tar.gz"
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/iksemel/.mtn2git_empty b/packages/iksemel/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/iksemel/iksemel_1.2.bb b/packages/iksemel/iksemel_1.2.bb
new file mode 100644
index 0000000000..903d8f046d
--- /dev/null
+++ b/packages/iksemel/iksemel_1.2.bb
@@ -0,0 +1,14 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "A simple, powerful XML-parsing library written in C."
+SECTION = "libs"
+PRIORITY    = "optional"
+DEPENDS     = "glibc gnutls"
+PR          = "r0"
+
+inherit pkgconfig autotools
+
+SRC_URI = "http://files.jabberstudio.org/iksemel/${P}.tar.gz"
+
+do_stage () {
+	autotools_stage_all
+}
-- 
cgit v1.2.3


From bfabca4f4b8ca51687ad0be1fea286903c47d63c Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 11 Apr 2007 16:31:13 +0000
Subject: gloox: Move to its own directory

---
 packages/gloox/.mtn2git_empty    |  0
 packages/gloox/gloox_0.8.1.bb    | 15 +++++++++++++++
 packages/gpephone/gloox_0.8.1.bb | 15 ---------------
 3 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 packages/gloox/.mtn2git_empty
 create mode 100644 packages/gloox/gloox_0.8.1.bb
 delete mode 100644 packages/gpephone/gloox_0.8.1.bb

diff --git a/packages/gloox/.mtn2git_empty b/packages/gloox/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gloox/gloox_0.8.1.bb b/packages/gloox/gloox_0.8.1.bb
new file mode 100644
index 0000000000..09004a8182
--- /dev/null
+++ b/packages/gloox/gloox_0.8.1.bb
@@ -0,0 +1,15 @@
+LICENSE     = "GPL"
+DESCRIPTION = "full-featured Jabber/XMPP client library."
+SECTION = "networking"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "iksemel libidn gnutls"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://camaya.net/download/${P}.tar.bz2"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/gloox_0.8.1.bb b/packages/gpephone/gloox_0.8.1.bb
deleted file mode 100644
index 09004a8182..0000000000
--- a/packages/gpephone/gloox_0.8.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE     = "GPL"
-DESCRIPTION = "full-featured Jabber/XMPP client library."
-SECTION = "networking"
-PRIORITY    = "optional"
-PR          = "r0"
-
-DEPENDS = "iksemel libidn gnutls"
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://camaya.net/download/${P}.tar.bz2"
-
-do_stage () {
-	autotools_stage_all
-}
-- 
cgit v1.2.3


From 57a7f933e677e7e8f77b19c135360e296a9ac132 Mon Sep 17 00:00:00 2001
From: Philippe De Swert <philippedeswert@scarlet.be>
Date: Wed, 11 Apr 2007 18:45:37 +0000
Subject: gtk-webcore: remove obsolete patches
 packages/gtk-webcore/osb-nrcit_svn.bb * update bb recipe
 packages/gtk-webcore/files/NRCit_HTTP_auth.diff * remove patch applied to svn
 packages/gtk-webcore/files/NRCit_unmap.diff * remove patch applied to svn

---
 packages/gtk-webcore/files/NRCit_HTTP_auth.diff | 132 ------------------------
 packages/gtk-webcore/files/NRCit_unmap.diff     |  39 -------
 packages/gtk-webcore/osb-nrcit_svn.bb           |   2 -
 3 files changed, 173 deletions(-)
 delete mode 100644 packages/gtk-webcore/files/NRCit_HTTP_auth.diff
 delete mode 100644 packages/gtk-webcore/files/NRCit_unmap.diff

diff --git a/packages/gtk-webcore/files/NRCit_HTTP_auth.diff b/packages/gtk-webcore/files/NRCit_HTTP_auth.diff
deleted file mode 100644
index 7a2df30d1d..0000000000
--- a/packages/gtk-webcore/files/NRCit_HTTP_auth.diff
+++ /dev/null
@@ -1,132 +0,0 @@
-Index: NRCit/src/Http.cpp
-===================================================================
---- NRCit/src/Http.cpp	(revision 55)
-+++ NRCit/src/Http.cpp	(working copy)
-@@ -299,3 +299,9 @@
- {
- 
- }
-+
-+HttpHeaderWWWAuthenticate::HttpHeaderWWWAuthenticate(const gchar * value)
-+    : HttpHeader(WWWAuthenticate, "WWW-Authenticate", value)
-+{
-+
-+}
-Index: NRCit/src/HttpCurl.cpp
-===================================================================
---- NRCit/src/HttpCurl.cpp	(revision 55)
-+++ NRCit/src/HttpCurl.cpp	(working copy)
-@@ -69,7 +69,7 @@
-     void setPostData(const gchar * contentType, GByteArray *);
- 
- protected:
--    bool shouldAuthenticate() { return m_authenticate; }
-+    bool shouldAuthenticate() { return m_need_authenticate; }
- 
-     /** Authenticates the request. */
-     void doAuth();
-@@ -89,7 +89,7 @@
- 
-     GByteArray * postData;
-     bool headerEnd;
--    bool m_authenticate;
-+    bool m_need_authenticate;
- 
-     gchar * proxy;
-     CurlFactory* parent;
-@@ -374,7 +374,7 @@
-     ,curl_post_last(NULL)
-     ,postData(NULL)
-     ,headerEnd(false)
--    ,m_authenticate(true)
-+    ,m_need_authenticate(true)
-     ,proxy(NULL)
-     ,parent(aParent)
-     ,status(-1)
-@@ -438,7 +438,8 @@
- }
- 
- void CurlRequest::doAuth() {
--    m_authenticate = m_listener->authenticate(this);
-+    m_listener->authenticate(this);
-+    m_need_authenticate = false; // set false to go on processing data in CurlRequest::data
- }
- 
- void CurlRequest::execute()
-@@ -457,6 +458,8 @@
-     curl_easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1);
-     curl_easy_setopt(handle, CURLOPT_MAXREDIRS, 10);
- 
-+    curl_easy_setopt(handle, CURLOPT_AUTOREFERER, 1);
-+
-     // url ptr must remain valid through the request
-     curl_easy_setopt(handle, CURLOPT_URL, m_url);
- 
-@@ -534,7 +537,7 @@
- 
- 
-     // if we are in middle of authenticating, do nothing.
--    if (status != HTTP_AUTH_REQUIRED || !m_authenticate) {
-+    if (status != HTTP_AUTH_REQUIRED || !m_need_authenticate) {
- 		m_listener->data(this, data, len);
-     }
- }
-@@ -570,6 +573,8 @@
- 		header = new HttpHeaderRefresh(value);
-     } else if (!strcmp(key, HTTP_SET_COOKIE)) {
- 		header = new HttpHeaderSetCookie(value);
-+    } else if (!strcmp(key, HTTP_WWW_AUTHENTICATE)) {
-+		header = new HttpHeaderWWWAuthenticate(value);
-     } else {
- 		header = new HttpHeader(HttpHeader::Unknown, key, value);
-     }
-@@ -584,7 +589,7 @@
- {
-     HttpHeader *hdr = parseHeader(data, len);
-     if (hdr) {
--		if (hdr->key() == HTTP_WWW_AUTHENTICATE && hdr->value())
-+		if (!strcmp(hdr->key(), HTTP_WWW_AUTHENTICATE) && hdr->value())
- 		{
- 			const gchar * value = hdr->value();
- 			char * realm = g_strrstr(value, "realm=" );
-Index: NRCit/src/PageLoadListener.cpp
-===================================================================
---- NRCit/src/PageLoadListener.cpp	(revision 55)
-+++ NRCit/src/PageLoadListener.cpp	(working copy)
-@@ -206,8 +206,9 @@
-             creds->setCredential(newcred, space);
-             request->authenticate(newcred.user(), newcred.password());
-         }
--        if (user) g_free(user);
--        if (password) g_free(password);
-+        // Do not free these values which are owned by Webi.
-+        // if (user) g_free(user);
-+        // if (password) g_free(password);
-         return ret;
-     }
- 
-Index: NRCit/src/Http.h
-===================================================================
---- NRCit/src/Http.h	(revision 55)
-+++ NRCit/src/Http.h	(working copy)
-@@ -165,6 +165,7 @@
- 		ContentLength,
- 		Refresh,
- 		SetCookie,
-+		WWWAuthenticate,
- 		Unknown,
- 		Invalid
- 	};
-@@ -236,6 +237,12 @@
- 	~HttpHeaderSetCookie() {}
- };
- 
-+class HttpHeaderWWWAuthenticate : public HttpHeader
-+{
-+public:
-+	HttpHeaderWWWAuthenticate(const gchar* value);
-+	~HttpHeaderWWWAuthenticate() {}
-+};
- 
- 
- #endif
diff --git a/packages/gtk-webcore/files/NRCit_unmap.diff b/packages/gtk-webcore/files/NRCit_unmap.diff
deleted file mode 100644
index 1f2be39922..0000000000
--- a/packages/gtk-webcore/files/NRCit_unmap.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: NRCit/src/gtk/webi.cc
-===================================================================
---- NRCit/src/gtk/webi.cc	(リビジョン 55)
-+++ NRCit/src/gtk/webi.cc	(作業コピー)
-@@ -50,6 +50,7 @@
- static void _webi_finalize (GObject * self) G_GNUC_UNUSED;
- static void _webi_realize (GtkWidget * widget) G_GNUC_UNUSED;
- static void _webi_map (GtkWidget * widget) G_GNUC_UNUSED;
-+static void _webi_unmap (GtkWidget * widget) G_GNUC_UNUSED;
- static gboolean _webi_expose_event (GtkWidget * widget, GdkEventExpose * event) G_GNUC_UNUSED;
- static void _webi_size_allocate (GtkWidget * widget, GtkAllocation * allocation) G_GNUC_UNUSED;
- 
-@@ -305,6 +306,7 @@
-     g_object_class->finalize = _webi_finalize;
-     gtk_widget_class->realize = _webi_realize;
-     gtk_widget_class->map = _webi_map;
-+    gtk_widget_class->unmap = _webi_unmap;
-     gtk_widget_class->expose_event = _webi_expose_event;
-     gtk_widget_class->size_allocate = _webi_size_allocate;
-     return;
-@@ -736,6 +738,18 @@
- }
- #undef PARENT_HANDLER
- 
-+static void
-+_webi_unmap (GtkWidget * widget)
-+{
-+
-+    g_return_if_fail(widget != NULL);
-+    g_return_if_fail(WEBI_IS_WEBI (widget));
-+
-+    GTK_WIDGET_UNSET_FLAGS(widget, GTK_MAPPED);
-+
-+    gdk_window_hide(widget->window);
-+}
-+
- static gboolean
- _webi_expose_event (GtkWidget * widget, GdkEventExpose * event)
- #define PARENT_HANDLER(___widget,___event) \
diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb
index 2060cb26d4..8a11d61996 100644
--- a/packages/gtk-webcore/osb-nrcit_svn.bb
+++ b/packages/gtk-webcore/osb-nrcit_svn.bb
@@ -10,8 +10,6 @@ PR = "r0"
 DEPENDS = "curl librsvg osb-nrcore"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCit;proto=https \
-	   file://NRCit_unmap.diff;patch=1 \
-           file://NRCit_HTTP_auth.diff;patch=1 \  
            file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1"
 S = "${WORKDIR}/NRCit"
 
-- 
cgit v1.2.3


From ad05d65efd9ba1ddc25dca17e2a6a69804362a65 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Thu, 12 Apr 2007 05:50:16 +0000
Subject: nunome: update to latest release (source tree cleaned from
 unnecessary binary cruft)

---
 packages/nunome/nunome_1.0.1.bb | 41 -----------------------------------------
 packages/nunome/nunome_1.0.2.bb | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 41 deletions(-)
 delete mode 100644 packages/nunome/nunome_1.0.1.bb
 create mode 100644 packages/nunome/nunome_1.0.2.bb

diff --git a/packages/nunome/nunome_1.0.1.bb b/packages/nunome/nunome_1.0.1.bb
deleted file mode 100644
index d8421c12f5..0000000000
--- a/packages/nunome/nunome_1.0.1.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Japanese input method plugin"
-SECTION = "opie/inputmethods"
-PRIORITY = "optional"
-LICENSE = "GPL"
-HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/"
-RDEPENDS = "virtual/japanese-font"
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-Qtopia-src-cleaned.tar.bz2 \
-	file://nunome.patch;patch=1"
-S = "${WORKDIR}/nunome"
-
-inherit opie
-
-EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${S}/Nnmlib INCLUDEPATH+=${S}/ui LIBS+=-L${S}"
-OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}"
-PARALLEL_MAKE = ""
-
-do_configure_prepend() {
-	echo -e "TEMPLATE=subdirs\nSUBDIRS=Nnmlib server ui dicman ui" >nunome.pro
-	pushd Nnmlib && qmake -project -t lib && popd
-	pushd server && qmake -project && echo -e "LIBS+=-lNnmlib\nTARGET=server.bin" >> server.pro && popd
-	pushd dicman && qmake -project && echo -e "LIBS+=-lnunome -lNnmlib\nTARGET=dicman.bin" >> dicman.pro && popd
-	pushd ui && qmake -project -t lib && echo -e "LIBS+=-lNnmlib\nTARGET=nunome" >> ui.pro && popd
-	find . -name "moc*"|xargs rm -f
-	find . -name "Makefile"|xargs rm -f
-}
-
-do_install() {
-	install -d ${D}${palmtopdir}/lib
-	install -d ${D}${palmtopdir}/bin
-	install -d ${D}${palmtopdir}/i18n/ja
-	install -d ${D}${palmtopdir}/share/nunome
-
-	oe_libinstall -so libNnmlib ${D}${palmtopdir}/lib
-        install -m 644 nunome_uni.dic  		${D}${palmtopdir}/share/nunome
-        install -m 755 server.bin        	${D}${palmtopdir}/bin/nnmsrv
-        install -m 755 dicman.bin		${D}${palmtopdir}/bin/nnmDicman
-        install -m 644 ui/nunome.qm		${D}${palmtopdir}/i18n/ja
-        install -m 644 dicman/nnmDicman.qm  	${D}${palmtopdir}/i18n/ja
-}
diff --git a/packages/nunome/nunome_1.0.2.bb b/packages/nunome/nunome_1.0.2.bb
new file mode 100644
index 0000000000..ae29277291
--- /dev/null
+++ b/packages/nunome/nunome_1.0.2.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "Japanese input method plugin"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/"
+RDEPENDS = "virtual/japanese-font"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-${PV}.tar.bz2 \
+	file://nunome.patch;patch=1"
+S = "${WORKDIR}/nunome"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${S}/Nnmlib INCLUDEPATH+=${S}/ui LIBS+=-L${S}"
+OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}"
+PARALLEL_MAKE = ""
+
+do_configure_prepend() {
+	echo -e "TEMPLATE=subdirs\nSUBDIRS=Nnmlib server ui dicman ui" >nunome.pro
+	pushd Nnmlib && qmake -project -t lib && popd
+	pushd server && qmake -project && echo -e "LIBS+=-lNnmlib\nTARGET=server.bin" >> server.pro && popd
+	pushd dicman && qmake -project && echo -e "LIBS+=-lnunome -lNnmlib\nTARGET=dicman.bin" >> dicman.pro && popd
+	pushd ui && qmake -project -t lib && echo -e "LIBS+=-lNnmlib\nTARGET=nunome" >> ui.pro && popd
+	find . -name "moc*"|xargs rm -f
+	find . -name "Makefile"|xargs rm -f
+}
+
+do_install() {
+	install -d ${D}${palmtopdir}/lib
+	install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/i18n/ja
+	install -d ${D}${palmtopdir}/share/nunome
+
+	oe_libinstall -so libNnmlib ${D}${palmtopdir}/lib
+        install -m 644 nunome_uni.dic  		${D}${palmtopdir}/share/nunome
+        install -m 755 server.bin        	${D}${palmtopdir}/bin/nnmsrv
+        install -m 755 dicman.bin		${D}${palmtopdir}/bin/nnmDicman
+        install -m 644 ui/nunome.qm		${D}${palmtopdir}/i18n/ja
+        install -m 644 dicman/nnmDicman.qm  	${D}${palmtopdir}/i18n/ja
+}
-- 
cgit v1.2.3


From d29ebb09f65f2c03ca29b2c20d87b59c510b1f84 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 12 Apr 2007 08:08:59 +0000
Subject: Updated to latest SVN version

---
 packages/linux/ixp4xx-kernel_2.6.20.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index e5868232f2..8e6f1b27df 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "800"
+IXP4XX_KERNEL_SVN_REV = "821"
 #
 # The directory containing the patches to be applied is
 # specified below
-- 
cgit v1.2.3


From eaf84f9d5a95bae2054ee7438905d05d7836370c Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 12 Apr 2007 08:15:31 +0000
Subject: sane-srcdates: bump gconf-dbus to 2.16

---
 conf/distro/angstrom-2007.1.conf      | 5 +----
 conf/distro/include/sane-srcdates.inc | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 86e87f31d6..5ad67f328f 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -96,9 +96,6 @@ PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh6"
 PREFERRED_VERSION_file = "4.18"
 PREFERRED_VERSION_file_native = "4.18"
 
-SRCDATE_gconf-dbus = "20060719"
-SRCDATE_gnome-vfs-dbus = "20060803"
-
 CVS_TARBALL_STASH = "\
 		     http://www.angstrom-distribution.org/unstable/sources/ \
 		     http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
@@ -130,7 +127,7 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
 
 PREFERRED_VERSION_fontconfig = "2.4.1"
-PREFERRED_VERSION_freetype = "2.3.1"
+PREFERRED_VERSION_freetype = "2.3.3"
 PREFERRED_VERSION_freetype-native = "2.2.1"
 PREFERRED_VERSION_cairo = "1.4.2"
 PREFERRED_VERSION_glib-2.0 = "2.12.11"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index fdac29e398..9fd71d05d8 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -46,7 +46,7 @@ SRCDATE_rosetta ?= "20060804"
 SRCDATE_gpesyncd ?= "20061128"
 
 # GNOME
-SRCDATE_gconf-dbus ?= "20060719"
+SRCDATE_gconf-dbus ?= "20070412"
 SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
-- 
cgit v1.2.3


From 797d987e5133f3579163b3cead61b9917a1d9390 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 12 Apr 2007 08:15:57 +0000
Subject: gconf-dbus: update svn to 2.16

---
 packages/gnome/gconf-dbus_svn.bb | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index 87daa1d227..0bb9765749 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -6,13 +6,10 @@ PROVIDES = "gconf"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
-PV = "2.10.0+svn${SRCDATE}"
+PV = "2.16.0+svn${SRCDATE}"
 PR = "r0"
 
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
-           file://gconf-dbus-update.patch;patch=1;pnum=0 \
-           file://xml-backend-locks-compile-fix.patch;patch=1 \
-           file://xml-backend-oldxml-Makefile.patch \
 	   file://69gconfd-dbus"
 
 inherit pkgconfig autotools
@@ -20,23 +17,22 @@ S = "${WORKDIR}/trunk"
 
 PARALLEL_MAKE = ""
 
-FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
-FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug"
+FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so \
+                 ${libdir}/GConf-dbus/2/*.so \
+                 ${libdir}/dbus-1.0 \
+		 ${sysconfdir} \
+		 ${datadir}/dbus*"
+FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug \
+                    ${libdir}/GConf-dbus/2/.debug ""
 
 EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
 
-HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
-
-do_compile_prepend() {
-	cd ${S}
-	patch -p1 < ../xml-backend-oldxml-Makefile.patch
+do_configure_prepend() {
+	touch ${S}/gtk-doc.make
 }
 
 do_stage() {
-        oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
-        install -d ${STAGING_INCDIR}/gconf/2/gconf/
-        ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
-        install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+	autotools_stage_all
 }
 
 do_install_append () {
@@ -45,3 +41,4 @@ do_install_append () {
 	install -d ${D}/${datadir}/dbus-1.0/services/
 	install -m 644  gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
 }
+
-- 
cgit v1.2.3


From e36f49aa083682f6fd3e630573b45335233fb42d Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 12 Apr 2007 08:20:34 +0000
Subject: gdado_2.2.bb : add a gtk+ dice rolling application for all those
 RPG/gamblers

---
 packages/gdado/.mtn2git_empty |  0
 packages/gdado/gdado_2.2.bb   | 15 +++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 packages/gdado/.mtn2git_empty
 create mode 100644 packages/gdado/gdado_2.2.bb

diff --git a/packages/gdado/.mtn2git_empty b/packages/gdado/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gdado/gdado_2.2.bb b/packages/gdado/gdado_2.2.bb
new file mode 100644
index 0000000000..feaa6ed991
--- /dev/null
+++ b/packages/gdado/gdado_2.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "gtk+ based dice roller for RPG games"
+HOMEPAGE = "http://gdado.sf.net"
+SECTION = "x11/games"
+LICENSE = "GPLv2"
+DEPENDS = "libgnomeui gtk+"
+PR = "r1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/gdado/gdado-${PV}.tar.gz"
+
+inherit autotools
+
+do_install_prepend() {
+	sed -i -e "s|Icon=gdado.png|Icon=${datadir}/pixmaps/gdado/gdado.png|" \
+	gdado.desktop
+}
+
-- 
cgit v1.2.3


From f4e239bb262baa864dcdeb345cb250f3954e7cb7 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 12 Apr 2007 09:43:08 +0000
Subject: linphone: Do not stage broken la files.

---
 packages/gpephone/linphone_1.5.0.bb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb
index bef090e22a..ee59000133 100644
--- a/packages/gpephone/linphone_1.5.0.bb
+++ b/packages/gpephone/linphone_1.5.0.bb
@@ -41,7 +41,4 @@ do_install_append() {
 do_stage() {
 	export LIBTOOL="${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool"
 	autotools_stage_all
-	cp ${S}/mediastreamer2/src/libquickstream.la ${STAGING_LIBDIR}
-	cp ${S}/mediastreamer2/src/libmediastreamer.la ${STAGING_LIBDIR}
-	cp ${S}/coreapi/liblinphone.la ${STAGING_LIBDIR}
 }
-- 
cgit v1.2.3


From c5afefe753fdc2f383f83db5e8b02337a9034480 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 12 Apr 2007 10:39:28 +0000
Subject: task-slugos: Set variables if unset to avoid errors

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

diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 9d38763c41..acb6bcaae5 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -103,8 +103,10 @@ SLUGOS_STANDARD_RRECOMMENDS += "\
 kernel-module-netconsole \
 "
 
+DISTRO_EXTRA_DEPENDS ?= ""
 DEPENDS += "${DISTRO_EXTRA_DEPENDS}"
 
+DISTRO_EXTRA_RDEPENDS ?= ""
 RDEPENDS += "\
 	kernel ixp4xx-npe \
 	base-files base-passwd netbase \
-- 
cgit v1.2.3


From 0f21dee7105b86695812c7c28e4379a503306737 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 12 Apr 2007 10:54:12 +0000
Subject: debianslug.conf, openslug.conf: Deprecated in favour of common
 slugos.conf

---
 conf/distro/debianslug.conf      | 11 -----------
 conf/distro/openslug-native.conf | 20 --------------------
 conf/distro/openslug.conf        | 11 -----------
 conf/distro/slugos-native.conf   | 20 ++++++++++++++++++++
 4 files changed, 20 insertions(+), 42 deletions(-)
 delete mode 100644 conf/distro/debianslug.conf
 delete mode 100644 conf/distro/openslug-native.conf
 delete mode 100644 conf/distro/openslug.conf
 create mode 100644 conf/distro/slugos-native.conf

diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
deleted file mode 100644
index 59123fd6b5..0000000000
--- a/conf/distro/debianslug.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#@TYPE: Distribution
-#@NAME: DebianSlug
-#@DESCRIPTION: DebianSlug Linux Distribution for the NSLU2
-
-DISTRO_NAME = "DebianSlug"
-IMAGE_BASENAME = "debianslug"
-TARGET_ARCH = "arm"
-ARM_INSTRUCTION_SET = "arm"
-TARGET_OS = "linux"
-
-require conf/distro/slugos.conf
diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf
deleted file mode 100644
index ac77532697..0000000000
--- a/conf/distro/openslug-native.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# Our build host is armeb, not armv5eb that the kernel reports
-BUILD_ARCH = "armeb"
-
-require conf/distro/openslug.conf
-
-# Corresponding packages should be in openslug-native.bb,
-# currently missing: ipkg-utils libtool quilt pkgconfig
-ASSUME_PROVIDED = "libtool-cross \
-		   libtool-native \
-		   automake-native \
-		   autoconf-native \
-		   quilt-native \
-		   ipkg-native \
-		   gnu-config-native \
-		   pkgconfig-native \
-		   virtual/armeb-linux-gcc \
-		   virtual/libc \
-		   update-rc.d \
-		   "
-
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
deleted file mode 100644
index f03c4f653e..0000000000
--- a/conf/distro/openslug.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#@TYPE: Distribution
-#@NAME: OpenSlug
-#@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
-
-DISTRO_NAME = "OpenSlug"
-IMAGE_BASENAME = "openslug"
-TARGET_ARCH = "armeb"
-ARM_INSTRUCTION_SET = "arm"
-TARGET_OS = "linux"
-
-require conf/distro/slugos.conf
diff --git a/conf/distro/slugos-native.conf b/conf/distro/slugos-native.conf
new file mode 100644
index 0000000000..77258c7148
--- /dev/null
+++ b/conf/distro/slugos-native.conf
@@ -0,0 +1,20 @@
+# Our build host is armeb, not armv5eb that the kernel reports
+BUILD_ARCH = "armeb"
+
+require conf/distro/slugos.conf
+
+# Corresponding packages should be in slugos-native.bb,
+# currently missing: ipkg-utils libtool quilt pkgconfig
+ASSUME_PROVIDED = "libtool-cross \
+		   libtool-native \
+		   automake-native \
+		   autoconf-native \
+		   quilt-native \
+		   ipkg-native \
+		   gnu-config-native \
+		   pkgconfig-native \
+		   virtual/armeb-linux-gcc \
+		   virtual/libc \
+		   update-rc.d \
+		   "
+
-- 
cgit v1.2.3


From 8bf985a982ad37e55af7fce9f9fbc284a202e93a Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 12 Apr 2007 12:50:07 +0000
Subject: task-base: also ship ide-disk module. Thanks to Michael Raitza for
 spotting that

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

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 8df6fa0450..e2bc56762b 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r22"
+PR = "r23"
 
 PACKAGES = "task-base \
             task-base-oh-minimal \
@@ -185,6 +185,7 @@ task-base-pcmcia-rrecommends = "\
     kernel-module-pcnet-cs \
     kernel-module-serial-cs \
     kernel-module-ide-cs \
+    kernel-module-ide-disk \
     ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} "
 
 task-base-pcmcia24-rrecommends = "\
-- 
cgit v1.2.3


From d591b320402f2069960fe1bc5f50d96e1b01efb0 Mon Sep 17 00:00:00 2001
From: Thomas Kunze <thommycheck@gmx.de>
Date: Thu, 12 Apr 2007 13:08:57 +0000
Subject: keymaps: fix keymap for collie/2.6 - close #1996

---
 packages/keymaps/files/collie/keymap-2.6.map | 6 +++---
 packages/keymaps/keymaps_1.0.bb              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/keymaps/files/collie/keymap-2.6.map b/packages/keymaps/files/collie/keymap-2.6.map
index 9aca5abb38..13eb7d2881 100644
--- a/packages/keymaps/files/collie/keymap-2.6.map
+++ b/packages/keymaps/files/collie/keymap-2.6.map
@@ -6,7 +6,6 @@
 # as Altgr, and simply use a proper keymap.  Said keymap is as
 # follows.
 # keymaps 0-2,4-5,8,12,20
-keycode   1 = Escape           Escape          
 keycode  14 = BackSpace
 	shift   keycode  14 = BackSpace
 	control keycode  14 = Delete
@@ -147,7 +146,7 @@ keycode  53 = slash
 	control	keycode  53 = Num_Lock
 	shiftl  control keycode  53 = Num_Lock
 	control shiftr  keycode  53 = Num_Lock
-keycode  54 = Shift           
+keycode  54 = AltGr
 keycode  55 = KP_Multiply     
 keycode  56 = Alt             
 keycode  57 = space
@@ -155,7 +154,7 @@ keycode  57 = space
 	control	keycode  57 = nul
 	shiftl  control keycode  57 = grave
 	control shiftr  keycode  57 = grave
-keycode  97 = Control         
+keycode  67 = Control         
 keycode  99 = Control_backslash
 	control keycode  99 = Control_backslash
 keycode 100 = AltGr           
@@ -164,6 +163,7 @@ keycode 105 = Left
 keycode 106 = Right           
 keycode 107 = Select          
 keycode 108 = Down            
+keycode 116  = Escape          
 string F1 = "\033[[A"
 string F2 = "\033[[B"
 string F3 = "\033[[C"
diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb
index 08fbc1eed5..0508facaa6 100644
--- a/packages/keymaps/keymaps_1.0.bb
+++ b/packages/keymaps/keymaps_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 RDEPENDS = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
-PR = "r13"
+PR = "r14"
 
 inherit update-rc.d
 
-- 
cgit v1.2.3


From 2893993b5767a8d3980f16b7e4b5bf596eb977a8 Mon Sep 17 00:00:00 2001
From: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Date: Thu, 12 Apr 2007 14:10:48 +0000
Subject: package_deb.bbclass: add shebang, closes #2086

---
 classes/package_deb.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass
index 388f9819bd..0c83e58a37 100644
--- a/classes/package_deb.bbclass
+++ b/classes/package_deb.bbclass
@@ -209,6 +209,7 @@ python do_package_deb () {
                 scriptfile = file(os.path.join(controldir, script), 'w')
             except OSError:
                 raise bb.build.FuncFailed("unable to open %s script file for writing." % script)
+            scriptfile.write("#!/bin/sh\n")
             scriptfile.write(scriptvar)
             scriptfile.close()
             os.chmod(os.path.join(controldir, script), 0755)
-- 
cgit v1.2.3


From 8e896b6f463e51a5ac6a14b4ccf6e8a56c3749b6 Mon Sep 17 00:00:00 2001
From: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Date: Thu, 12 Apr 2007 14:58:55 +0000
Subject: mamona: add distro config for mamona
 (http://www.vivi.eng.br/index.php?title=Main_Page), closes #2103

---
 conf/distro/mamona.conf | 60 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 conf/distro/mamona.conf

diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf
new file mode 100644
index 0000000000..26bf8b94f1
--- /dev/null
+++ b/conf/distro/mamona.conf
@@ -0,0 +1,60 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Mamona 
+#@--------------------------------------------------------------------
+
+DISTRO = "mamona"
+DISTRO_NAME = Mamona""
+DISTRO_VERSION = "test-${DATE}"
+DISTRO_TYPE = "debug"
+#DISTRO_TYPE = "release"
+
+TARGET_VENDOR = "-mamona"
+
+require conf/distro/include/angstrom-glibc.inc
+
+INHERIT += " package_deb debian"
+TARGET_OS  = "linux-gnueabi"
+
+TARGET_FPU_nokia770 = "soft"
+TARGET_FPU_n800 = "hard"
+
+FEED_ARCH_nokia770	= "armv5te"
+
+# Actually n800 is armv6 but we are using armv5te because qemu does not emulate
+# armv6 yet. 
+FEED_ARCH_n800		= "armv5te"
+#FEED_ARCH_n800		= "armv6"
+
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+#NPTL stuff
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-mamona-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+
+PREFERRED_VERSION_binutils = "2.17.50.0.5"
+PREFERRED_VERSION_binutils-cross = "2.17.50.0.5"
+
+PREFERRED_VERSION_gcc = "4.1.1"
+PREFERRED_VERSION_gcc-cross = "4.1.1"
+PREFERRED_VERSION_gcc-initial-cross = "4.1.1"
+
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
+
+PREFERRED_VERSION_glibc ?= "2.5"
+
+PREFERRED_VERSION_glibc-intermediate ?= "2.5"
+
+PREFERRED_VERSION_glibc-initial ?= "2.5"
+
+require conf/distro/include/sane-srcdates.inc
+
+
-- 
cgit v1.2.3


From d77127ab253ab95a2b57f37eb28df438ccb0ee4e Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 12 Apr 2007 16:05:24 +0000
Subject: python-2.4.4-manifest.inc: fix python-misc * FILES_foo is useless is
 foo isn't in PACKAGES....

---
 packages/python/python-2.4.4-manifest.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/python/python-2.4.4-manifest.inc b/packages/python/python-2.4.4-manifest.inc
index 7a1035ac50..33f5bac2f2 100644
--- a/packages/python/python-2.4.4-manifest.inc
+++ b/packages/python/python-2.4.4-manifest.inc
@@ -10,13 +10,14 @@
 
 PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc"
 
-PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc"
+PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc-dbg python-misc"
 
 DESCRIPTION_python-misc-dbg="Misc Python debug files"
 FILES_python-misc-dbg="${libdir}/python2.4/lib-dynload/.debug"
 RDEPENDS_python-misc-dbg="python-core"
 
 DESCRIPTION_python-misc="Misc Python files"
+PR_python-misc="ml1"
 FILES_python-misc="${libdir}/python2.4/"
 RDEPENDS_python-misc="python-core"
 
-- 
cgit v1.2.3


From 67435ac524d77b9f164cc9e3a419c3e0144201d6 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 12 Apr 2007 16:08:13 +0000
Subject: angstrom: add omap5192 support

---
 conf/distro/angstrom-2007.1.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 5ad67f328f..4c0fa9ff84 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -53,6 +53,7 @@ FEED_ARCH_ixp4xx	= "armv5te"
 FEED_ARCH_magician	= "armv5te"
 FEED_ARCH_netbook-pro	= "armv5te"
 FEED_ARCH_nokia770	= "armv5te"
+FEED_ARCH_omap5912osk   = "armv5te"
 FEED_ARCH_poodle	= "armv5te"
 FEED_ARCH_spitz		= "armv5te"
 FEED_ARCH_tosa		= "armv5te"
-- 
cgit v1.2.3


From cfce83cf61593878a185957fa2824da4bf01e8af Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 12 Apr 2007 18:43:25 +0000
Subject: dates: update to 0.4.1 (from Poky)

---
 packages/pimlico/dates.inc      | 1 +
 packages/pimlico/dates_0.3.1.bb | 5 -----
 packages/pimlico/dates_0.4.1.bb | 3 +++
 packages/pimlico/dates_svn.bb   | 4 +---
 4 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 packages/pimlico/dates_0.3.1.bb
 create mode 100644 packages/pimlico/dates_0.4.1.bb

diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc
index 4f92b2c767..d4debfd28d 100644
--- a/packages/pimlico/dates.inc
+++ b/packages/pimlico/dates.inc
@@ -8,6 +8,7 @@ RCONFLICTS_${PN} = "openmoko-dates"
 inherit autotools pkgconfig gtk-icon-cache
 
 # EXTRA_OECONF = "--disable-debug"
+EXTRA_OECONF = "--enable-owl=true"
 
 FILES_${PN} += "${datadir}/pixmaps/dates.png"
 
diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.3.1.bb
deleted file mode 100644
index 176d2b9077..0000000000
--- a/packages/pimlico/dates_0.3.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require dates.inc
-
-PR = "r3"
-
-SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
diff --git a/packages/pimlico/dates_0.4.1.bb b/packages/pimlico/dates_0.4.1.bb
new file mode 100644
index 0000000000..d7f0185b86
--- /dev/null
+++ b/packages/pimlico/dates_0.4.1.bb
@@ -0,0 +1,3 @@
+require dates.inc
+
+SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb
index cac0eb4fae..cfac6630b4 100644
--- a/packages/pimlico/dates_svn.bb
+++ b/packages/pimlico/dates_svn.bb
@@ -1,10 +1,8 @@
 require dates.inc
 
-PR = "r2"
-
 DEFAULT_PREFERENCE = "-1"
 
-PV = "0.3.1+svn${SRCDATE}"
+PV = "0.4.1+svn${SRCDATE}"
 S = "${WORKDIR}/trunk"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
-- 
cgit v1.2.3


From 43232a233516b72942e47ee650221c64c331f13e Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 12 Apr 2007 18:44:48 +0000
Subject: tasks: Patch tasks to make it single instance (from Poky)

---
 packages/pimlico/files/tasks-single.diff | 9 +++++++++
 packages/pimlico/tasks_0.4.bb            | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 packages/pimlico/files/tasks-single.diff

diff --git a/packages/pimlico/files/tasks-single.diff b/packages/pimlico/files/tasks-single.diff
new file mode 100644
index 0000000000..dd807ea256
--- /dev/null
+++ b/packages/pimlico/files/tasks-single.diff
@@ -0,0 +1,9 @@
+Index: tasks/data/tasks.desktop.in
+===================================================================
+--- tasks/data/tasks.desktop.in	(revision 115)
++++ tasks/data/tasks.desktop.in	(working copy)
+@@ -9,3 +9,4 @@
+ Categories=GTK;Application;Office;ProjectManagement;
+ Terminal=false
+ StartupNotify=true
++SingleInstance=true
diff --git a/packages/pimlico/tasks_0.4.bb b/packages/pimlico/tasks_0.4.bb
index 679dedf9da..068579ef9c 100644
--- a/packages/pimlico/tasks_0.4.bb
+++ b/packages/pimlico/tasks_0.4.bb
@@ -1,3 +1,6 @@
 require tasks.inc
 
-SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz"
+PR = "r1"
+
+SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz \
+        file://tasks-single.diff;patch=1"
-- 
cgit v1.2.3


From 5db9837e1292b6f24bc240189c5dd038c7533a95 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 12 Apr 2007 22:15:06 +0000
Subject: gnome-doc-utils/gnome-desktop: Running scrollkeeper is pointless,
 disable.

---
 packages/gnome/gnome-desktop/.mtn2git_empty     |  0
 packages/gnome/gnome-desktop/scrollkeeper.patch | 17 +++++++++++++++++
 packages/gnome/gnome-desktop_2.16.1.bb          |  3 +++
 packages/gnome/gnome-doc-utils_0.7.1.bb         |  2 ++
 4 files changed, 22 insertions(+)
 create mode 100644 packages/gnome/gnome-desktop/.mtn2git_empty
 create mode 100644 packages/gnome/gnome-desktop/scrollkeeper.patch

diff --git a/packages/gnome/gnome-desktop/.mtn2git_empty b/packages/gnome/gnome-desktop/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gnome/gnome-desktop/scrollkeeper.patch b/packages/gnome/gnome-desktop/scrollkeeper.patch
new file mode 100644
index 0000000000..c1b7f3b44a
--- /dev/null
+++ b/packages/gnome/gnome-desktop/scrollkeeper.patch
@@ -0,0 +1,17 @@
+Index: gnome-desktop-2.16.1/configure.in
+===================================================================
+--- gnome-desktop-2.16.1.orig/configure.in	2006-10-02 19:00:52.000000000 +0000
++++ gnome-desktop-2.16.1/configure.in	2007-04-12 21:12:36.000000000 +0000
+@@ -113,9 +113,9 @@
+ dnl scrollkeeper checks
+ 
+ AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
+-if test x$SCROLLKEEPER_CONFIG = xno; then
+-  AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package)
+-fi
++dnl if test x$SCROLLKEEPER_CONFIG = xno; then
++dnl   AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package)
++dnl fi
+ 
+ dnl Language Support
+ 
diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb
index 647e751c57..1e3e814d17 100644
--- a/packages/gnome/gnome-desktop_2.16.1.bb
+++ b/packages/gnome/gnome-desktop_2.16.1.bb
@@ -6,6 +6,9 @@ inherit gnome pkgconfig
 
 DEPENDS = "gnome-common gnome-doc-utils libgnomeui"
 
+SRC_URI += "file://scrollkeeper.patch;patch=1"
+
+EXTRA_OECONF = "--disable-scrollkeeper"
 EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
 
 do_configure_prepend () {
diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb
index 18d6d3012a..f190a5ae13 100644
--- a/packages/gnome/gnome-doc-utils_0.7.1.bb
+++ b/packages/gnome/gnome-doc-utils_0.7.1.bb
@@ -5,6 +5,8 @@ PR = "r1"
 
 inherit gnome
 
+EXTRA_OECONF = "--disable-scrollkeeper"
+
 FILES_${PN} += "${datadir}/xml*"
 
 do_stage() {
-- 
cgit v1.2.3


From 4db3cf0ae1688007779db00019287084f6b063b6 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 12 Apr 2007 22:28:51 +0000
Subject: tasks: Remove strange (uneeded) syntax before it spreads any further

---
 packages/tasks/task-gpe.bb          | 22 +++++++++++-----------
 packages/tasks/task-gpephone.bb     | 14 +++++++-------
 packages/tasks/task-sdk-base.bb     |  2 +-
 packages/tasks/task-sdk-extra.bb    |  6 +++---
 packages/tasks/task-sdk-gpephone.bb |  2 +-
 packages/tasks/task-sdk-opie.bb     |  2 +-
 packages/tasks/task-sdk-sbox-gpe.bb |  2 +-
 packages/tasks/task-sdk-sbox.bb     |  2 +-
 packages/tasks/task-sdk.bb          |  2 +-
 packages/tasks/task-xfce-base.bb    |  2 +-
 10 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb
index b59b3ceea3..ed9460ef13 100644
--- a/packages/tasks/task-gpe.bb
+++ b/packages/tasks/task-gpe.bb
@@ -16,11 +16,11 @@ PACKAGES = "\
     gpe-task-desktopapps \
     gpe-task-sectest"
 
-RDEPENDS_gpe-base-depends := "\
+RDEPENDS_gpe-base-depends = "\
     diet-x11 \
     virtual/xserver"
 
-RDEPENDS_gpe-task-base := "\
+RDEPENDS_gpe-task-base = "\
     gpe-bootsplash \
     bluez-utils-dbus \
     matchbox \
@@ -49,7 +49,7 @@ RDEPENDS_gpe-task-base := "\
     pango-module-basic-x \
     pango-module-basic-fc"
 
-RDEPENDS_gpe-task-pim := "\
+RDEPENDS_gpe-task-pim = "\
     gpe-timesheet \
     gpe-todo \
     gpe-calendar \
@@ -58,7 +58,7 @@ RDEPENDS_gpe-task-pim := "\
     gpe-today \
     gpesyncd"
 
-RDEPENDS_gpe-task-settings := "\
+RDEPENDS_gpe-task-settings = "\
     matchbox-panel-manager \
     gpe-bluetooth \
     gpe-beam \
@@ -75,7 +75,7 @@ RDEPENDS_gpe-task-settings := "\
     minimix \
     xmonobut"
 
-RDEPENDS_gpe-task-apps := "\
+RDEPENDS_gpe-task-apps = "\
     gpe-edit \
     gpe-gallery \
     gpe-calculator \
@@ -91,7 +91,7 @@ RDEPENDS_gpe-task-apps := "\
     gpe-scap \
     gpe-windowlist"
 
-RDEPENDS_gpe-task-games := "\
+RDEPENDS_gpe-task-games = "\
     gpe-go \
     gpe-lights \
     gpe-othello \
@@ -99,22 +99,22 @@ RDEPENDS_gpe-task-games := "\
     gsoko \
     xdemineur"
 
-RDEPENDS_gpe-task-connectivity := "\
+RDEPENDS_gpe-task-connectivity = "\
     gpe-mini-browser"
 #    gaim
 #    linphone-hh
 
-RDEPENDS_gpe-task-apps-extra := "\
+RDEPENDS_gpe-task-apps-extra = "\
     gpe-filemanager \
     gpe-soundbite \
     mbmerlin"
 
-RDEPENDS_gpe-task-web := "\
+RDEPENDS_gpe-task-web = "\
     gpe-irc \
     minimo \
     gaim"
 
-RDEPENDS_gpe-task-desktopapps := "\
+RDEPENDS_gpe-task-desktopapps = "\
     firefox \
     thunderbird \
     galculator \
@@ -122,7 +122,7 @@ RDEPENDS_gpe-task-desktopapps := "\
     gpdf \
     totem"
 
-RDEPENDS_gpe-task-sectest := "\
+RDEPENDS_gpe-task-sectest = "\
     mbmerlin \
     nmap \
     ettercap \
diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb
index a480a03b86..96a27e6ed2 100644
--- a/packages/tasks/task-gpephone.bb
+++ b/packages/tasks/task-gpephone.bb
@@ -12,11 +12,11 @@ PACKAGES = "\
     gpephone-task-apps \
     gpephone-task-development"
 
-RDEPENDS_gpephone-base-depends := "\
+RDEPENDS_gpephone-base-depends = "\
     diet-x11 \
     virtual/xserver"
 
-RDEPENDS_gpephone-task-development := "\
+RDEPENDS_gpephone-task-development = "\
     rxvt-unicode \
     xmonobut \
     gpe-terminal \
@@ -25,7 +25,7 @@ RDEPENDS_gpephone-task-development := "\
     strace \
     e2fsprogs"
 
-RDEPENDS_gpephone-task-base := "\
+RDEPENDS_gpephone-task-base = "\
     cms92init \
     gsmmux \
     connect \
@@ -73,10 +73,10 @@ RDEPENDS_gpephone-task-base := "\
     ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus xtscal", "",d)} \
 "
 
-RDEPENDS_gpephone-task-pim := "\
+RDEPENDS_gpephone-task-pim = "\
      gpesyncd"
 
-RDEPENDS_gpephone-task-settings := "\
+RDEPENDS_gpephone-task-settings = "\
     gpe-su \
     gpe-conf \
     gpe-clock \
@@ -85,12 +85,12 @@ RDEPENDS_gpephone-task-settings := "\
     keylaunch \
     minilite"
 
-RDEPENDS_gpephone-task-apps := "\
+RDEPENDS_gpephone-task-apps = "\
     gpe-watch \
     gpe-what \
     matchbox-panel-hacks \
     gpe-scap \
     gpe-windowlist"
 
-RDEPENDS_gpephone-task-connectivity := "\
+RDEPENDS_gpephone-task-connectivity = "\
 "
diff --git a/packages/tasks/task-sdk-base.bb b/packages/tasks/task-sdk-base.bb
index 3bf708902f..52956239eb 100644
--- a/packages/tasks/task-sdk-base.bb
+++ b/packages/tasks/task-sdk-base.bb
@@ -5,7 +5,7 @@ ALLOW_EMPTY = "1"
 
 DEPENDS = "task-sdk"
 
-RDEPENDS := "\
+RDEPENDS = "\
     task-sdk-bare \
     glibc \
     glibc-dev \
diff --git a/packages/tasks/task-sdk-extra.bb b/packages/tasks/task-sdk-extra.bb
index 805974c9b5..33f8e3a5e8 100644
--- a/packages/tasks/task-sdk-extra.bb
+++ b/packages/tasks/task-sdk-extra.bb
@@ -8,7 +8,7 @@ PACKAGES = "\
     task-sdk-x11-ext \
     task-sdk-gpe"
 
-RDEPENDS_task-sdk-x11 := "\
+RDEPENDS_task-sdk-x11 = "\
     atk-dev \
     cairo-dev \
     gconf-dbus-dev \
@@ -20,7 +20,7 @@ RDEPENDS_task-sdk-x11 := "\
     pango-dev \
     startup-notification-dev"
 
-RDEPENDS_task-sdk-x11-ext := "\
+RDEPENDS_task-sdk-x11-ext = "\
     libxcursor-dev \
     libxdmcp-dev \
     libxft-dev \
@@ -45,7 +45,7 @@ RDEPENDS_task-sdk-x11-ext := "\
     libxtst-dev"
 
 
-RDEPENDS_task-sdk-gpe := "\
+RDEPENDS_task-sdk-gpe = "\
     libcontactsdb-dev \
     esound-dev \
     libeventdb-dev \
diff --git a/packages/tasks/task-sdk-gpephone.bb b/packages/tasks/task-sdk-gpephone.bb
index 10afccf477..56b398b04e 100644
--- a/packages/tasks/task-sdk-gpephone.bb
+++ b/packages/tasks/task-sdk-gpephone.bb
@@ -3,7 +3,7 @@ PR = "r0"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
-RDEPENDS := "\
+RDEPENDS = "\
     libidn-dev \
     libim-dev \
     gloox-dev \
diff --git a/packages/tasks/task-sdk-opie.bb b/packages/tasks/task-sdk-opie.bb
index 34fca7bcc6..0c4c1f6558 100644
--- a/packages/tasks/task-sdk-opie.bb
+++ b/packages/tasks/task-sdk-opie.bb
@@ -5,7 +5,7 @@ ALLOW_EMPTY = "1"
 
 PACKAGES = "task-sdk-opie"
 
-RDEPENDS_task-sdk-opie := "\
+RDEPENDS_task-sdk-opie = "\
     libopiebluez2 \
     libopiedb2 \
     libopiecore2 \
diff --git a/packages/tasks/task-sdk-sbox-gpe.bb b/packages/tasks/task-sdk-sbox-gpe.bb
index 77950dfb01..930de7cd2e 100644
--- a/packages/tasks/task-sdk-sbox-gpe.bb
+++ b/packages/tasks/task-sdk-sbox-gpe.bb
@@ -3,7 +3,7 @@ PR = "r0"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
-RDEPENDS := "\
+RDEPENDS = "\
     glib-2.0-utils \
     gdk-pixbuf-loader-png \
     gdk-pixbuf-loader-jpeg \
diff --git a/packages/tasks/task-sdk-sbox.bb b/packages/tasks/task-sdk-sbox.bb
index aa8dddfbd8..2d73fe2716 100644
--- a/packages/tasks/task-sdk-sbox.bb
+++ b/packages/tasks/task-sdk-sbox.bb
@@ -3,7 +3,7 @@ PR = "r6"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
-RDEPENDS := "\
+RDEPENDS = "\
     strace \
     gdb \
     sbrsh \
diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
index 6e6770c913..fee2be51b8 100644
--- a/packages/tasks/task-sdk.bb
+++ b/packages/tasks/task-sdk.bb
@@ -7,7 +7,7 @@ PACKAGES = "\
     task-sdk-bare \
     "
 
-RDEPENDS_task-sdk-bare := "\
+RDEPENDS_task-sdk-bare = "\
     glibc \
     glibc-dev \
     libgcc1 \
diff --git a/packages/tasks/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb
index bd6841f025..3a4081199b 100644
--- a/packages/tasks/task-xfce-base.bb
+++ b/packages/tasks/task-xfce-base.bb
@@ -8,7 +8,7 @@ ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
 PR = "r2"
 
-RDEPENDS= "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \
+RDEPENDS = "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \
 	xfce4-panel xfce4-panel-plugins xfce-mcs-plugins xfwm4-mcs-plugins \
 	xfce4-panel-mcs-plugins \
 	xfdesktop-mcs-plugins"
-- 
cgit v1.2.3


From accb1927c162f0a4f98ad77894af23439e4d4364 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 13 Apr 2007 08:44:03 +0000
Subject: task-base: major restructure - task-base-FEATURENAME are built
 nevermind does MACHINE supports them - task-base depends on task-* packages
 only - MACHINE/DISTRO features only - task-boot contain stuff needed to get
 minimal bootable image - task-distro-base contain distro addons -
 task-machine-base contain machine specific addons - ability to choose SSH
 daemon (dropbear, openssh, none) by distro - ability to choose /dev/ manager
 (udev, devfsd, mdev) by distro - ability to choose getty provider (tinylogin
 by default) by distro With this version it is easier to create smaller rootfs
 - for example image with ONLY bluetooth support is "task-boot +
 task-base-bluetooth".

---
 packages/tasks/task-base.bb | 403 +++++++++++++++++++++++++-------------------
 1 file changed, 225 insertions(+), 178 deletions(-)

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index e2bc56762b..bd38da5359 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,207 +1,229 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r23"
-
-PACKAGES = "task-base \
-            task-base-oh-minimal \
-            task-base-core-default"
+PR = "r26"
+
+PACKAGES = 'task-boot \
+            task-base \
+            task-distro-base \
+            task-machine-base \
+            \
+            task-base-acpi \
+            task-base-alsa \
+            task-base-apm \
+            task-base-bluetooth \
+            task-base-ext2 \
+            task-base-irda \
+            task-base-keyboard \
+            task-base-pci \
+            task-base-pcmcia \
+            task-base-phone \
+            task-base-screen \
+            task-base-serial \
+            task-base-touchscreen \
+            task-base-usbgadget \
+            task-base-usbhost \
+            task-base-wifi \
+            \
+            task-base-cramfs \
+            task-base-ipsec \
+            task-base-ipv6 \
+            task-base-nfs \
+            task-base-ppp \
+            task-base-smbfs \
+	    \
+            ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
+	    '
 
 ALLOW_EMPTY = "1"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "all"
 
-# Valid only in MACHINE_FEATURES:
 #
-# kernel24
-# kernel26
-# apm
-# keyboard
-# touchscreen
-# screen
-# pci
-# acpi
-# phone
+# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
+#
+PACKAGE_ARCH_task-base = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
 
-# Valid only in DISTRO_FEATURES:
 #
-# nfs
-# smbfs
-# ipsec
-# wifi
-# ppp
+# udev, devfsd, mdev (from busybox) or none
+#
+DISTRO_DEV_MANAGER ?= "${@base_contains("MACHINE_FEATURES", "kernel26",  "udev","",d)} "
 
-# Valid COMBINED_FEATURES:
-# (These features need to be supported by both the machine and the distro)
 #
-# alsa
-# bluetooth
-# ext2
-# irda
-# pci
-# pcmcia
-# redboot
-# uboot
-# usbgadget
-# usbhost
+# sysvinit, upstart
+#
+DISTRO_INIT_MANAGER ?= "sysvinit"
 
+#
+# tinylogin, getty
+#
+DISTRO_LOGIN_MANAGER ?= "tinylogin"
 
-DISTRO_CORE_PACKAGE ?= "task-base-core-default"
+#
+# linux-hotplug or none
+#
+HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24",  "linux-hotplug","",d)} "
 
 #
-# task-base
+# dropbear, openssh or none
 #
-RDEPENDS_task-base = "\
-    ${DISTRO_CORE_PACKAGE} \
-    kernel \
-    ${@base_contains("MACHINE_FEATURES", "kernel24", "${task-base-kernel24-rdepends}", "",d)} \
-    ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
-    ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
-    ${@base_contains("MACHINE_FEATURES", "acpi", "${task-base-acpi-rdepends}", "",d)} \
-    ${@base_contains("MACHINE_FEATURES", "keyboard", "${task-base-keyboard-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pci", "${task-base-pci-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "uboot", "${task-base-uboot-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "redboot", "${task-base-redboot-rdepends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "raid", "${task-distro-raid-rdepends}", "",d)} \
-    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
-    ${MACHINE_EXTRA_RDEPENDS} \
-    ${DISTRO_EXTRA_RDEPENDS}"
-
-RRECOMMENDS_task-base = "\
-    ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-extras-rrecommends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rrecommends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rrecommends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rrecommends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rrecommends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "usbgadget", "${task-base-usbgadget-rrecommends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rrecommends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rrecommends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rrecommends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rrecommends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rrecommends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "cramfs", "${task-distro-cramfs-rrecommends}", "",d)} \
-    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
-    ${MACHINE_EXTRA_RRECOMMENDS} \
-    ${DISTRO_EXTRA_RRECOMMENDS}"
-
-
-#
-# task-base-oh-minimal
-# An example of a small cut down machine configuration
-#
-RDEPENDS_task-base-oh-minimal = "\
-    kernel \
-    ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
-    ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \
-    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
+DISTRO_SSH_DAEMON ?= "dropbear"